From 0a133510f72623eba75038680bbde70672d39152 Mon Sep 17 00:00:00 2001 From: Louis DUFOUR Date: Mon, 13 Mar 2023 16:26:15 +0100 Subject: [PATCH 1/8] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'README.md'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/README.md b/README.md index 5238397..723f75b 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,24 @@ pipenv update // Lancement du shell pipenv pipenv shell ``` +### Côté BDD +Il faudra que vous connectiez à votre BDD PostgreSQL. +Exécuter le script `Table.sql` qui se trouve dans src avec la commande ci-dessous. +```sh +\i /YOUR_PATH/Detection_d_intrusion/src/Table.sql +``` + +Si jamais vous vous retrouvez à devoir partager votre BDD il faudra exécuter la commande ci-dessous. +```sh +GRANT ALL ON TO ; +GRANT CONNECT ON DATABASE dblodufour1 TO ; +``` + +Pour se connecter à la BDD d'une autre personne pensée bien à mettre le nom de sa database. +Ici, c'est `dblodufour1` +```sh +psql -h londres -d -U -W +``` ### Lancement il faut lancé 3 terminal pipenv pour : From 3f6ab60d2b343665bbc45879078f077272fe868d Mon Sep 17 00:00:00 2001 From: Louis DUFOUR Date: Mon, 13 Mar 2023 16:30:16 +0100 Subject: [PATCH 2/8] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'README.md'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 723f75b..e300b87 100644 --- a/README.md +++ b/README.md @@ -37,6 +37,8 @@ Ici, c'est `dblodufour1` psql -h londres -d -U -W ``` +**ATTENTION** `londres` est un serveur héberger dans l'infrastructure de notre établissement universitaire. + ### Lancement il faut lancé 3 terminal pipenv pour : From f5d5e3fa293f68f3fe0de0c34efef5df3fbe0040 Mon Sep 17 00:00:00 2001 From: Louis DUFOUR Date: Mon, 13 Mar 2023 16:32:15 +0100 Subject: [PATCH 3/8] Supprimer 'src/truc.txt' --- src/truc.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 src/truc.txt diff --git a/src/truc.txt b/src/truc.txt deleted file mode 100644 index e69de29..0000000 From cd7f8cf521c240cbca7d3e1adbf1c7de9225a9e1 Mon Sep 17 00:00:00 2001 From: Louis DUFOUR Date: Mon, 13 Mar 2023 16:42:14 +0100 Subject: [PATCH 4/8] Supprimer 'Pymodbus/truc.txt' --- Pymodbus/truc.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Pymodbus/truc.txt diff --git a/Pymodbus/truc.txt b/Pymodbus/truc.txt deleted file mode 100644 index e69de29..0000000 From dc153539bdbe662cd3718f96a5fc632b190e164f Mon Sep 17 00:00:00 2001 From: Darius BERTRAND Date: Mon, 13 Mar 2023 17:23:33 +0100 Subject: [PATCH 5/8] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20'Pymodbus/Pipfi?= =?UTF-8?q?le'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Pymodbus/Pipfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Pymodbus/Pipfile b/Pymodbus/Pipfile index 817f893..3f371c0 100644 --- a/Pymodbus/Pipfile +++ b/Pymodbus/Pipfile @@ -15,5 +15,5 @@ ipython = "*" [dev-packages] [requires] -python_version = "3.10.6" +python_version = "3.9" From 68d72ef7687f943e2a1a8cf7a01d97fd6b83adba Mon Sep 17 00:00:00 2001 From: Darius Bertrand Date: Mon, 13 Mar 2023 17:27:27 +0000 Subject: [PATCH 6/8] debut lien bdd decoder --- src/.Table.sql.swp | Bin 0 -> 12288 bytes src/Main.py | 35 ++++++++++++++++++++++------------- 2 files changed, 22 insertions(+), 13 deletions(-) create mode 100644 src/.Table.sql.swp diff --git a/src/.Table.sql.swp b/src/.Table.sql.swp new file mode 100644 index 0000000000000000000000000000000000000000..d959b90af394f0caadf973439a1694b838ac3307 GIT binary patch literal 12288 zcmeI&K}#D!6bJB^9xMpeP!IN0M!h6rvYWMsqIigAg|{D}LfPr6YIf3{ zbRhZ=fWRvRKGCXIbM1zu#RW0<`R6P4Vkrb5009U<00Izz00bcL-UZB{K<9jk52K6B zj>f`^ar6-b1Rwwb2tWV=5P$##AOHafKmY>oP(a2+UuTF;Irjhm@$dgje)!8d<3yY< zoO#Y2ue;^kaIQI5oPV4P&X8lz$vG$pKmY;|fB*y_009U<00Izz08x3J1lK?(J*kJ{ zj~bR_9BY+jYQ+o(s{GJCm0gu<(a(EIC(+8oob8I}Sn5)({5Uh-_PrIobrxrPx# literal 0 HcmV?d00001 diff --git a/src/Main.py b/src/Main.py index fbea8fd..11a0a16 100644 --- a/src/Main.py +++ b/src/Main.py @@ -9,7 +9,7 @@ from cProfile import label import psycopg2 as psy# pip3 install types-psycopg2 -import pandas as pand # pip3 install pandas +import pandas as pd # pip3 install pandas import getpass ################# Debut Tips ################# @@ -19,22 +19,30 @@ import getpass ################# Fin Tips ################# -def insert_Country(connection, filename: str): +def insert_Status(connection, flow str): cur = connection.cursor() - df = pand.DataFrame(pand.read_csv(filename)).dropna() - id_table=0 - for row in df.itertuples(): - for country in row.country_lastfm.split('; '): - id_table+=1 - cur.execute("INSERT INTO Country VALUES (%s, %s) ON CONFLICT ON CONSTRAINT doublons_country DO NOTHING;", - (id_table, - str(country)) - ) + df = pd.DataFrame(pd.read_csv(filename)).dropna() + + for row in df.itertuples(): + cur.execute("INSERT INTO Status VALUES (%s,%s,%s );", + (row.addresse, + row.type, + row.valeur) + ) connection.commit() cur.close() +def status_State(connection): + cur = connection.cursor() + pd.read_sql(''' SELECT adresse, type, valeur FROM Status''' + res = cur.fetchone() + return res + cur.close() + + + def create_tables(connection, filename): cur = connection.cursor() with open(filename) as f: @@ -52,10 +60,11 @@ if __name__ == '__main__': db_name = 'dblodufour1' db_user = input('Utilisateur : ') if not db_user: - db_user = 'lodufour1' + db_user = 'ladufour1' db_password = getpass('Mot de passe : ') connection = psy.connect(host=db_host, database=db_name, user=db_user, password=db_password) + create_tables(connection, 'Table.sql') - connection.close() \ No newline at end of file + connection.close() From c02b4a3867aa5dbbf3d6600e76364f85841e5101 Mon Sep 17 00:00:00 2001 From: Darius Bertrand Date: Mon, 13 Mar 2023 17:28:22 +0000 Subject: [PATCH 7/8] debut lien decoder bdd --- Pymodbus/Pipfile | 2 +- Pymodbus/Pipfile.lock | 104 +++++++++++++++++++++++------------------- 2 files changed, 57 insertions(+), 49 deletions(-) diff --git a/Pymodbus/Pipfile b/Pymodbus/Pipfile index 817f893..3f371c0 100644 --- a/Pymodbus/Pipfile +++ b/Pymodbus/Pipfile @@ -15,5 +15,5 @@ ipython = "*" [dev-packages] [requires] -python_version = "3.10.6" +python_version = "3.9" diff --git a/Pymodbus/Pipfile.lock b/Pymodbus/Pipfile.lock index f1d867d..3dd4e0b 100644 --- a/Pymodbus/Pipfile.lock +++ b/Pymodbus/Pipfile.lock @@ -347,11 +347,11 @@ }, "ipython": { "hashes": [ - "sha256:b13a1d6c1f5818bd388db53b7107d17454129a70de2b87481d555daede5eb49e", - "sha256:b38c31e8fc7eff642fc7c597061fff462537cf2314e3225a19c906b7b0d8a345" + "sha256:5b54478e459155a326bf5f42ee4f29df76258c0279c36f21d71ddb560f88b156", + "sha256:735cede4099dbc903ee540307b9171fbfef4aa75cfcacc5a273b2cda2f02be04" ], "index": "pypi", - "version": "==8.10.0" + "version": "==8.11.0" }, "jedi": { "hashes": [ @@ -507,11 +507,11 @@ "repl" ], "hashes": [ - "sha256:38a224f82cefe644fc7de51410e2fc3d48e96c764682608e13d89f039171267c", - "sha256:714e5d6b7e28c4016a94346e73033aff276b6ce8bd22e470ba4fd8b982e08a98" + "sha256:5769ac9a00ffc154e1761c69299c1968dcab1c2a61741b1caff89c4aea81dbcf", + "sha256:ca954cf0c7e88e7cfc0d273960919b68090e72e2a88f39d2a3b50f4ab8eaf2a9" ], "index": "pypi", - "version": "==3.1.3" + "version": "==3.2.0" }, "redis": { "hashes": [ @@ -535,6 +535,14 @@ "index": "pypi", "version": "==2.5.0" }, + "setuptools": { + "hashes": [ + "sha256:4d3c92fac8f1118bb77a22181355e29c239cabfe2b9effdaa665c66b711136d7", + "sha256:8ab4f1dbf2b4a65f7eec5ad0c620e84c34111a68d3349833494b9088212214dd" + ], + "markers": "python_version >= '3.7'", + "version": "==65.7.0" + }, "shellingham": { "hashes": [ "sha256:368bf8c00754fd4f55afb7bbb86e272df77e4dc76ac29dbcbb81a59e9fc15744", @@ -552,50 +560,50 @@ }, "sqlalchemy": { "hashes": [ - "sha256:011ef3c33f30bae5637c575f30647e0add98686642d237f0c3a1e3d9b35747fa", - "sha256:0adca8a3ca77234a142c5afed29322fb501921f13d1d5e9fa4253450d786c160", - "sha256:1644c603558590f465b3fa16e4557d87d3962bc2c81fd7ea85b582ecf4676b31", - "sha256:2267c004e78e291bba0dc766a9711c389649cf3e662cd46eec2bc2c238c637bd", - "sha256:25e4e54575f9d2af1eab82d3a470fca27062191c48ee57b6386fe09a3c0a6a33", - "sha256:2a2f9120eb32190bdba31d1022181ef08f257aed4f984f3368aa4e838de72bc0", - "sha256:2c82395e2925639e6d320592943608070678e7157bd1db2672a63be9c7889434", - "sha256:3f927340b37fe65ec42e19af7ce15260a73e11c6b456febb59009bfdfec29a35", - "sha256:54aa9f40d88728dd058e951eeb5ecc55241831ba4011e60c641738c1da0146b7", - "sha256:57dcd9eed52413f7270b22797aa83c71b698db153d1541c1e83d45ecdf8e95e7", - "sha256:582053571125895d008d4b8d9687d12d4bd209c076cdbab3504da307e2a0a2bd", - "sha256:59cf0cdb29baec4e074c7520d7226646a8a8f856b87d8300f3e4494901d55235", - "sha256:6363697c938b9a13e07f1bc2cd433502a7aa07efd55b946b31d25b9449890621", - "sha256:662a79e80f3e9fe33b7861c19fedf3d8389fab2413c04bba787e3f1139c22188", - "sha256:67901b91bf5821482fcbe9da988cb16897809624ddf0fde339cd62365cc50032", - "sha256:679b9bd10bb32b8d3befed4aad4356799b6ec1bdddc0f930a79e41ba5b084124", - "sha256:738c80705e11c1268827dbe22c01162a9cdc98fc6f7901b429a1459db2593060", - "sha256:77a380bf8721b416782c763e0ff66f80f3b05aee83db33ddfc0eac20bcb6791f", - "sha256:77d05773d5c79f2d3371d81697d54ee1b2c32085ad434ce9de4482e457ecb018", - "sha256:817aab80f7e8fe581696dae7aaeb2ceb0b7ea70ad03c95483c9115970d2a9b00", - "sha256:81f1ea264278fcbe113b9a5840f13a356cb0186e55b52168334124f1cd1bc495", - "sha256:8a88b32ce5b69d18507ffc9f10401833934ebc353c7b30d1e056023c64f0a736", - "sha256:8ff0a7c669ec7cdb899eae7e622211c2dd8725b82655db2b41740d39e3cda466", - "sha256:918c2b553e3c78268b187f70983c9bc6f91e451a4f934827e9c919e03d258bd7", - "sha256:954f1ad73b78ea5ba5a35c89c4a5dfd0f3a06c17926503de19510eb9b3857bde", - "sha256:95a18e1a6af2114dbd9ee4f168ad33070d6317e11bafa28d983cc7b585fe900b", - "sha256:9946ee503962859f1a9e1ad17dff0859269b0cb453686747fe87f00b0e030b34", - "sha256:9a7ecaf90fe9ec8e45c86828f4f183564b33c9514e08667ca59e526fea63893a", - "sha256:a42e6831e82dfa6d16b45f0c98c69e7b0defc64d76213173456355034450c414", - "sha256:b01dce097cf6f145da131a53d4cce7f42e0bfa9ae161dd171a423f7970d296d0", - "sha256:b5deafb4901618b3f98e8df7099cd11edd0d1e6856912647e28968b803de0dae", - "sha256:b67d6e626caa571fb53accaac2fba003ef4f7317cb3481e9ab99dad6e89a70d6", - "sha256:c1e8edc49b32483cd5d2d015f343e16be7dfab89f4aaf66b0fa6827ab356880d", - "sha256:c621f05859caed5c0aab032888a3d3bde2cae3988ca151113cbecf262adad976", - "sha256:ce54965a94673a0ebda25e7c3a05bf1aa74fd78cc452a1a710b704bf73fb8402", - "sha256:d8efdda920988bcade542f53a2890751ff680474d548f32df919a35a21404e3f", - "sha256:dc7b9f55c2f72c13b2328b8a870ff585c993ba1b5c155ece5c9d3216fa4b18f6", - "sha256:dd801375f19a6e1f021dabd8b1714f2fdb91cbc835cd13b5dd0bd7e9860392d7", - "sha256:f342057422d6bcfdd4996e34cd5c7f78f7e500112f64b113f334cdfc6a0c593d", - "sha256:f696828784ab2c07b127bfd2f2d513f47ec58924c29cff5b19806ac37acee31c", - "sha256:fdb2686eb01f670cdc6c43f092e333ff08c1cf0b646da5256c1237dc4ceef4ae" + "sha256:03cd5709839fc376538f102c58f632d48bd0b92715bd290c3b2c066e0dd0f214", + "sha256:0433abeb650c72c872e31010bff8536907fb05f6fa29a9b880046570c03383ca", + "sha256:059ddd4ddbfb8f1c872d601b168273dfaab0eae458736c7c754187b9a8e92ad5", + "sha256:1012c0440108c360b94f43667525365c43516e8c7f1f7de8dfb73471181055df", + "sha256:13eb2a5882cfd9f4eedaaec14a5603a096f0125f7c3cb48611b3bfa3c253f25d", + "sha256:15c92107437770087ad4fece6ed9553ab97474f3b92d15eb62cea9686228f252", + "sha256:1edb6621782f9a3e80750ba1859580b778a424242d4e6b9bcd46fa6beca75c12", + "sha256:22f60d214899b573edc8aeb9ba84f7e832505511ce68974636e6da4a27c957a3", + "sha256:2bffc27ec0386ef4af7c8923f0f809f88671859b907c9e11f000c39b97195e99", + "sha256:2c3869a7bdd5bb76fb50976abe339e30cce8e9f7c778a50811d310ec82cdf51a", + "sha256:3c4e673da09af37b7a5c13b947fdb387c3800d43dcd86c1d553e3c70369e4749", + "sha256:4756878d0ceb6e0e9c6cfcfaa9df81adbfcca8cc4b9ec37934918008c0f20507", + "sha256:50b15fce441b8eb13bfd06df1088aa52c9a3d72d4894e3456040857d48a622da", + "sha256:56d38c3638965df5257ac4648ba2887aaf1e3409397192dd85ddfe7b96dc7680", + "sha256:5c00d2b3607f9ae5c0827ebb2d01020c26cfce4064aa664db21d1fd6a47f8f60", + "sha256:621e92ace804e19da2e472e349736d7ba5e2e4a14d41c4de9e2474e5f40a11ed", + "sha256:68c4c5ab13997fa7af37d5780da11ddc184d4e88fb2d8a26525044c233f03bc7", + "sha256:6df48bb7af217fd086617aae1f9606ff91cfab9a29c3e77dd80e4bab8aaf29fc", + "sha256:72e8d65b20147df71297d863981d8e56e429a8ae2bb835bd5e89efd7ef849866", + "sha256:744b01fcdfef66b7373262bf75d714a4339f85c05b74b1732749f25ed65f33f6", + "sha256:7e33867e09820c98630f7faec535a8cc4116fd362787404b41883d373437290b", + "sha256:7fab3d4062472e1e6002bfcd53cc7446189941be083a5465760aa794092004ee", + "sha256:7fe933831e17f93947b4e3db4e4a7470dae24340f269baf06cdfcc0538c8d1cb", + "sha256:869ca02661f6d4cece5823997a364dfa97601de11151fca3ebc3429eb9ffa2e0", + "sha256:8e7d5766fb99743eb70126daaff45f43bee3f4b79ba6047a0749912e8538f0ff", + "sha256:9a4d9a7e9b344bf8ce2ed699baa8a43d9fbdad3aecff259f1d0daf6bb2e7e0c0", + "sha256:9bb63e22ddf01cbbb290e61f31471480d2e40283e558cdd924b94dc4fc2e186b", + "sha256:a7e55659740e768a1bf1257275b565137a3d28839789c85193dd6a1e642b3cc9", + "sha256:ac12d8bef707d02ef179f0586c848db2954668dca2b72c69df950e08dc8cddb4", + "sha256:adf597e756e27173be57f243cc17bea7af1ac74b35c0120aace2738f59c92a48", + "sha256:b21694c8543becc2bc4f05f8d07970860e6ad005024712b7195abb1f4e0daf47", + "sha256:b52be78c5e86ade646c82a10b2be4b6ed8f623052b4405b26681880df1a15d5a", + "sha256:c12f0455f30d637644f4d6df2bda1475c61398483edb58d55c670be31a31d549", + "sha256:c2c41bf05b4cf4ffead35896affa3b457c17755d0fd83b1ba72f7f55abb3a3f1", + "sha256:d6cb241c5c1af422c0fa742bd09a8eaf158da1433617ded1ffcbb56de6ff8047", + "sha256:d811b97f58d99e5948752087903cb414fd77a60a5e09293be16c924219178c3b", + "sha256:d81b2fa605939c437f8b0b8522ec2c19508f3036d6043cb70a15dd56760ab710", + "sha256:e13cea675937125417953fd011138f13cf979051567f48074fffb3bb0b64b917", + "sha256:e40c39cfcbe416a7722a226ecd98fad0e08f8ae33e8f94b0858afe094583bfbc", + "sha256:f53542654124d30a3c3ebff9f99e5749add75e4cf28895a2ca6cd1458039bd8f", + "sha256:ffda70373ddfe8ec733d518e4e41eb5599480d48e8496c44bb0cac0e37b281c0" ], "index": "pypi", - "version": "==2.0.4" + "version": "==2.0.5.post1" }, "stack-data": { "hashes": [ From d72b5bc10acb3a628fbd0299308a30be7848af3a Mon Sep 17 00:00:00 2001 From: Louis DUFOUR Date: Mon, 13 Mar 2023 17:43:26 +0100 Subject: [PATCH 8/8] Supprimer 'src/.Table.sql.swp' --- src/.Table.sql.swp | Bin 12288 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 src/.Table.sql.swp diff --git a/src/.Table.sql.swp b/src/.Table.sql.swp deleted file mode 100644 index d959b90af394f0caadf973439a1694b838ac3307..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI&K}#D!6bJB^9xMpeP!IN0M!h6rvYWMsqIigAg|{D}LfPr6YIf3{ zbRhZ=fWRvRKGCXIbM1zu#RW0<`R6P4Vkrb5009U<00Izz00bcL-UZB{K<9jk52K6B zj>f`^ar6-b1Rwwb2tWV=5P$##AOHafKmY>oP(a2+UuTF;Irjhm@$dgje)!8d<3yY< zoO#Y2ue;^kaIQI5oPV4P&X8lz$vG$pKmY;|fB*y_009U<00Izz08x3J1lK?(J*kJ{ zj~bR_9BY+jYQ+o(s{GJCm0gu<(a(EIC(+8oob8I}Sn5)({5Uh-_PrIobrxrPx#