From 935dd40702c35b951b77da2bfe5f32c81bb1358d Mon Sep 17 00:00:00 2001 From: Adrien Bourmault Date: Tue, 9 Jul 2019 16:43:47 +0200 Subject: [PATCH] Add files via upload --- src/downloader.py | 4 ++++ src/globs.py | 30 +++++++++++++++--------------- src/id-card.ico | Bin 0 -> 1901 bytes src/logger.py | 1 + src/updater.py | 9 +++++++++ 5 files changed, 29 insertions(+), 15 deletions(-) create mode 100644 src/id-card.ico diff --git a/src/downloader.py b/src/downloader.py index 85dcd54..e25040b 100644 --- a/src/downloader.py +++ b/src/downloader.py @@ -146,6 +146,10 @@ class newcredentials: self.password = invite.key AESObj = AESCipher(globs.CNIRCryptoKey) + try: + os.mkdir(globs.CNIRFolder + '\\config') + except: + pass with open(globs.CNIRConfig, 'wb+') as (configFile): logfile.printdbg('Saving credentials in encrypted config file') configFile.write(AESObj.encrypt(self.login + '||' + self.password)) diff --git a/src/globs.py b/src/globs.py index 0bdd936..0cf1aac 100644 --- a/src/globs.py +++ b/src/globs.py @@ -25,21 +25,21 @@ import os # CNIRevelator version -version = [3, 0, 0] -verstring_full = "{}.{}.{}".format(version[0], version[1], version[2]) -verstring = "{}.{}".format(version[0], version[1]) +version = [3, 0, 0] +verstring_full = "{}.{}.{}".format(version[0], version[1], version[2]) +verstring = "{}.{}".format(version[0], version[1]) -changelog = "Mise-à-jour majeure avec corrections suivantes :\n- Renouvellement de la signature numérique de l'exécutable\n- Amélioration de présentation du log en cas d'erreur\n- Refonte totale du code source et désobfuscation\n- Téléchargements en HTTPS fiables avec somme de contrôle" +changelog = "Mise-à-jour majeure avec corrections suivantes :\n- Renouvellement de la signature numérique de l'exécutable\n- Amélioration de présentation du log en cas d'erreur\n- Refonte totale du code source et désobfuscation\n- Téléchargements en HTTPS fiables avec somme de contrôle" -CNIRTesserHash = '5b58db27f7bc08c58a2cb33d01533b034b067cf8' -CNIRFolder = os.getcwd() -CNIRLColor = "#006699" -CNIRName = "CNIRevelator {}".format(verstring) -CNIRCryptoKey = '82Xh!efX3#@P~2eG' +CNIRTesserHash = '5b58db27f7bc08c58a2cb33d01533b034b067cf8' +CNIRFolder = os.getcwd() +CNIRLColor = "#006699" +CNIRName = "CNIRevelator {}".format(verstring) +CNIRCryptoKey = '82Xh!efX3#@P~2eG' -CNIRConfig = CNIRFolder + '\\config\\conf.ig' -CNIRErrLog = CNIRFolder + '\\logs\\\\error.log' -CNIRLauncherLog = CNIRFolder + '\\logs\\\\launcher.log' -CNIRUrlConfig = CNIRFolder + '\\config\\urlconf.ig' -CNIRVerStock = CNIRFolder + '\\downloads\\versions.lst' -CNIREnv = os.getenv('APPDATA') + '/CNIRevelator/' +CNIRConfig = CNIRFolder + '\\config\\conf.ig' +CNIRErrLog = CNIRFolder + '\\logs\\error.log' +CNIRLauncherLog = CNIRFolder + '\\logs\\launcher.log' +CNIRUrlConfig = CNIRFolder + '\\config\\urlconf.ig' +CNIRVerStock = CNIRFolder + '\\downloads\\versions.lst' +CNIREnv = os.getenv('APPDATA') + '/CNIRevelator/' diff --git a/src/id-card.ico b/src/id-card.ico new file mode 100644 index 0000000000000000000000000000000000000000..efa86e4bc2d929c43599b2b48a2b3b15813b4f6c GIT binary patch literal 1901 zcmcgtYgE!_9De_RiVOtGL~CBU%*r*jZCP0XIh{5ytmUnlar@6ExfCkK^V z1wDQw(Ie;O8UU?r_$(GNlP{d+ zEkVc_bqjg#>|v5F0HrI(HD(84Q$+?4yy!Lf?98my=}}$L)>%Wpn+J##RW&EJZ`%p# z2qCr4D~hBb+5X&>`+>W+Lj6>4Wl?$hZOZB6wJI7hn@`U#UT^gLfLx81#MNpxx=!e) zVkgHIkYO!F6XmNc>uz1T7)mXUO_;<-J025vj?1B!{82Gssv=u_8x)_=c<7GXBd3CB zS;|aC!ymJ&*elW=KZd%}=??b4S;=unzS08jt}2Z(el3W{BB%`f%TQX!d7F{^U1&)s zE8Nh+?Ezf&ux8k%B;kI9Pw$vBuuyOkH;#3}4+?Ic(e}kZXh3&yoGO{prR&#@Nzf}0 zdZINXMd;sq&53Nq-A1cIr#aDCYcAKnyLk?gB7&3FsLx^bH%C{Z+Xn3gZ_WcLu1U)v zDSJ2)jx_iE!2>9%JYu2yZg8W<7bA>Wya0=MMG&}oZU>j$H&HP@8+mkRjUo7>-dNPo z3t@hV`5)aX2G;*nQ}cl0k;T)}X_g2s zp2JdK^fS#Y40`L^3Z2y#CXLs^2&tm3Fv!K~)fx^Gbq3Y8>$OI2SkH&;M6)|S!+J7n zt)9jiL2?w`KRJA7{KKR{7v|YrOf$d9d9B;`Jik<1bz&v@(2dlXTlER@u>cDEV0i{( z;q3A$uD~b(z9F|5@etDDmpxY zFc2fH*bVAjxy1txIaaEXHa#P!d;whVre0OMx9rO-2PEnf-n~P@=~DuajoX^->33tt zhsn9$)*gwzo?+$0Hr($YF&v)hF=M?SY0hnq9@pg-EkU=jb#nfOC}Z3L`1cHVGK+W_ zCE4G)x8~=o%YBc^O_b9NY~og^G$;RRg$E?z?;pHA?T@Vam6zaqu%t>h)bkQtxT8~@ zH%`ujMTK=?7iFbYmBMFl46z_sMv30^mJt>NXK(s}j{$b9z06 z+TfN9s4M7CpNC0;zj^2qlzMx-^im+eujYyafkDyZgj?D7r5WqtZ`akDx=_gWxh$tF z(=c40SzS&XN?GV8-s9_dZy__&JEVuxz^Asinl)c10G(7ogy2E!KN|H*h3)g?@y#G_ zT{rZ`$cG`FJGgeTNrHys`XI?WFg`m*X$5jK@o*$~ZIKN%XcAP~alTuoC($u1S4yn$ z2@fm*JgH|hbCcx?RGZ?VUDT)xjHNS}twZf4kPk@T{&BS`Y?{t|&z!I1$7V7Bbq2K< z_6!|te~MAJyIG@CWqFP#X!BrR*-}_^oAUo>%v_Gm0=?j3