Merge branch 'master' of https://github.com/clyhtsuriva/ATS-Project

14 files changed, 33 insertions, 6 deletions

diff --git a/README.md b/README.md
index afdfee5..9dd9af0 100755
--- a/README.md
+++ b/README.md
@@ -9,9 +9,9 @@ Ce projet nous fera utiliser les outils suivants :
 
 Web : HTML / CSS / JS / PostgreSQL / Python / Apache 2
 
-Analyse des paquets : TCP Dump / PostgreSQL
+Analyse des paquets : TCP Dump / PostgreSQL / Shell
 
-Automatisation du déploiement : Bash
+Automatisation du déploiement : Shell
 
 Editeurs : Neovim / Nano
 
diff --git a/analyse/script.sh b/analyse/script.sh
index 0eb3150..5c2aff0 100755
--- a/analyse/script.sh
+++ b/analyse/script.sh
@@ -1,5 +1,15 @@
 #!/bin/bash
 
+#TO-DO:
+#prend en compte l'interface internet par defaut sur la machine
+#recupere l'adresse IP lie a cette interface
+#installe tcpdump avant toute chose
+#corrige le deplacement du cut dans certaines trames (comme ARP)
+#Affiche quelque chose d'autre que "IP" en protocole (probleme pour la plupart des paquets
+#enleve ce qu'il y a apres la virgule pour les secondes
+#ajoute la date
+#insert dans la bdd les differentes infos
+
 while :
 do
 
diff --git a/web/.htpasswd b/www/.htpasswd
index 029fc64..029fc64 100755
--- a/web/.htpasswd
+++ b/www/.htpasswd
diff --git a/web/apache-modified/apache2.conf b/www/apache-modified/apache2.conf
index 96c1601..3bdb180 100755
--- a/web/apache-modified/apache2.conf
+++ b/www/apache-modified/apache2.conf
@@ -123,7 +123,7 @@ Group ${APACHE_RUN_GROUP}
 # each client request will result in AT LEAST one lookup request to the
 # nameserver.
 #
-HostnameLookups On
+HostnameLookups Off
 
 # ErrorLog: The location of the error log file.
 # If you do not specify an ErrorLog directive within a <VirtualHost>
@@ -171,6 +171,9 @@ Include ports.conf
 	Options Indexes FollowSymLinks
 	AllowOverride All
 	Require all granted
+	AddHandler mod_python .py
+	PythonHandler mod_python.publisher
+	PythonDebug On
 </Directory>
 
 #<Directory /srv/>
@@ -226,5 +229,5 @@ IncludeOptional sites-enabled/*.conf
 
 # vim: syntax=apache ts=4 sw=4 sts=4 sr noet
 
-ErrorDocument 404 /404.html
+#ErrorDocument 404 /404.html
 
diff --git a/www/apache-modified/help.txt b/www/apache-modified/help.txt
new file mode 100644
index 0000000..80b10ff
--- /dev/null
+++ b/www/apache-modified/help.txt
@@ -0,0 +1,13 @@
+#pour felix
+
+#first, you have to install apache2 (server), mod_python (to build html via python) and python-psycopg2 (to use psql) :
+apt install apache2 libapache2-mod-python python-psycopg2
+
+#replace the actual /var/www by our ATS-Project/www
+cp -r /root/ATS-Project/www /var/
+
+#give the x rights on the .py files
+chmod +x /var/www/html *.py
+
+#replace the actual /etc/apache2/apache2.conf by our ATS-Project/www/apache-modified/apache2.conf
+cp -r ...
diff --git a/web/howto_psql b/www/howto_psql
index 7d5adfc..7d5adfc 100755
--- a/web/howto_psql
+++ b/www/howto_psql
diff --git a/web/website/.htaccess b/www/html/.htaccess
index 825c08d..d074f91 100755
--- a/web/website/.htaccess
+++ b/www/html/.htaccess
@@ -1,4 +1,5 @@
 AuthType Basic
 AuthName "restricted area"
-AuthUserFile /var/www/html/ATS-Project/web/.htpasswd
+AuthUserFile /var/www/.htpasswd
 require valid-user
+DirectoryIndex index.py
diff --git a/web/website/fonctions.py b/www/html/fonctions.py
index c1566af..c1566af 100755
--- a/web/website/fonctions.py
+++ b/www/html/fonctions.py
diff --git a/web/website/index.html b/www/html/index.html
index 27f4dda..27f4dda 100755
--- a/web/website/index.html
+++ b/www/html/index.html
diff --git a/web/website/index.py b/www/html/index.py
index 131a82a..010ed2d 100755
--- a/web/website/index.py
+++ b/www/html/index.py
@@ -35,5 +35,5 @@ def index(req):
 + content + 
 """
 </table>
-"""))
+""")) #tableheads to change so it takes the output of the select
 
diff --git a/web/website/init-bd.sql b/www/html/init-bd.sql
index f1a4f2b..f1a4f2b 100755
--- a/web/website/init-bd.sql
+++ b/www/html/init-bd.sql
diff --git a/web/website/style.css b/www/html/style.css
index 6d0bd42..6d0bd42 100755
--- a/web/website/style.css
+++ b/www/html/style.css
diff --git a/web/website/test.html b/www/html/test.html
index b789672..b789672 100755
--- a/web/website/test.html
+++ b/www/html/test.html
diff --git a/web/website/test.py b/www/html/test.py
index 6ff289c..6ff289c 100755
--- a/web/website/test.py
+++ b/www/html/test.py