From cc45584292d8899f5db938a0f61bd3908b79b39d Mon Sep 17 00:00:00 2001 From: qo-op Date: Thu, 3 Dec 2020 12:10:38 +0100 Subject: [PATCH] ./jaklis.py set -A mon_avatar.png --- zen/cesium-messaging/jaklis.py | 61 +++++++++++------ .../lib/__pycache__/cesium.cpython-36.pyc | Bin 13137 -> 13955 bytes .../lib/__pycache__/likes.cpython-36.pyc | Bin 7922 -> 7936 bytes .../lib/__pycache__/natools.cpython-36.pyc | Bin 9292 -> 9306 bytes zen/cesium-messaging/lib/cesium.py | 62 +++++++++++++++--- 5 files changed, 92 insertions(+), 31 deletions(-) diff --git a/zen/cesium-messaging/jaklis.py b/zen/cesium-messaging/jaklis.py index bd34372..97a4d43 100755 --- a/zen/cesium-messaging/jaklis.py +++ b/zen/cesium-messaging/jaklis.py @@ -19,6 +19,7 @@ load_dotenv(dotenv_path) # Parse arguments parser = argparse.ArgumentParser() parser.add_argument('-v', '--version', action='store_true', help="Affiche la version actuelle du programme") +parser.add_argument('-k', '--key', help="Chemin vers mon trousseau de clé (PubSec)") subparsers = parser.add_subparsers() read_cmd = subparsers.add_parser('read', help="Lecture des messages") @@ -30,7 +31,12 @@ eraseProfile_cmd = subparsers.add_parser('erase', help="Effacer son profile Cesi like_cmd = subparsers.add_parser('like', help="Voir les likes d'un profile / Liker un profile (option -s NOTE)") unlike_cmd = subparsers.add_parser('unlike', help="Supprimer un like") -if len(sys.argv) <= 1 or not sys.argv[1] in ('read','send','delete','set','get','erase','like','unlike','-v','--version'): +if sys.argv[1] == '-k': + cmd = sys.argv[3] +else: + cmd = sys.argv[1] + +if len(sys.argv) <= 1 or not cmd in ('read','send','delete','set','get','erase','like','unlike','-v','--version'): sys.stderr.write("Veuillez indiquer une commande valide:\n\n") parser.print_help() sys.exit(1) @@ -56,8 +62,10 @@ setProfile_cmd.add_argument('-v', '--ville', help="Ville du profile") setProfile_cmd.add_argument('-a', '--adresse', help="Adresse du profile") setProfile_cmd.add_argument('-pos', '--position', nargs=2, help="Points géographiques (lat + lon)") setProfile_cmd.add_argument('-s', '--site', help="Site web du profile") +setProfile_cmd.add_argument('-A', '--avatar', help="Chemin vers mon avatar en PNG") getProfile_cmd.add_argument('-p', '--profile', help="Nom du profile") +getProfile_cmd.add_argument('-a', '--avatar', action='store_true', help="Récupérer également l'avatar au format raw base64") # Likes management like_cmd.add_argument('-p', '--profile', help="Profile cible") @@ -73,7 +81,7 @@ if args.version: def createTmpDunikey(): # Generate pseudo-random nonce nonce=[] - for i in range(32): + for _ in range(32): nonce.append(random.choice(string.ascii_letters + string.digits)) nonce = ''.join(nonce) keyPath = "/tmp/secret.dunikey-" + nonce @@ -87,26 +95,37 @@ pod = os.getenv('POD') if not pod: pod="https://g1.data.le-sou.org" -dunikey = os.getenv('DUNIKEY') -if not dunikey: - keyPath = createTmpDunikey() - dunikey = keyPath -else: +if args.key: + dunikey = args.key keyPath = False +else: + dunikey = os.getenv('DUNIKEY') + if not dunikey: + keyPath = createTmpDunikey() + dunikey = keyPath + else: + keyPath = False if not os.path.isfile(dunikey): HOME = os.getenv("HOME") - dunikey = HOME + os.getenv('DUNIKEY') + dunikey = HOME + dunikey + if not os.path.isfile(dunikey): + sys.stderr.write('Le fichier de trousseau {0} est introuvable.\n'.format(dunikey)) + sys.exit(1) # Build cesiumMessaging class -if sys.argv[1] == "read": +if cmd == "read": messages = ReadFromCesium(dunikey, pod) messages.read(args.number, args.outbox, args.json) -elif sys.argv[1] == "send": +elif cmd == "send": if args.fichier: with open(args.fichier, 'r') as f: - titre = f.readline().replace('\n','') - msg = ''.join(f.read().splitlines(True)[0:]) + msgT = f.read() + titre = msgT.splitlines(True)[0].replace('\n', '') + msg = ''.join(msgT.splitlines(True)[1:]) + if args.titre: + titre = args.titre + msg = msgT elif args.titre and args.message: titre = args.titre msg = args.message @@ -117,29 +136,29 @@ elif sys.argv[1] == "send": messages = SendToCesium(dunikey, pod, args.destinataire, args.outbox) messages.send(titre, msg) -elif sys.argv[1] == "delete": +elif cmd == "delete": messages = DeleteFromCesium(dunikey, pod, args.outbox) messages.delete(args.id[0]) # Build cesium+ profiles class -elif sys.argv[1] in ('set','get','erase'): +elif cmd in ('set','get','erase'): cesium = Profiles(dunikey, pod) - if sys.argv[1] == "set": - cesium.set(args.name, args.description, args.ville, args.adresse, args.position, args.site) - elif sys.argv[1] == "get": - cesium.get(args.profile) - elif sys.argv[1] == "erase": + if cmd == "set": + cesium.set(args.name, args.description, args.ville, args.adresse, args.position, args.site, args.avatar) + elif cmd == "get": + cesium.get(args.profile, args.avatar) + elif cmd == "erase": cesium.erase() # Build cesium+ likes class -elif sys.argv[1] == "like": +elif cmd == "like": if args.stars or args.stars == 0: gchange = SendLikes(dunikey, pod) gchange.like(args.stars, args.profile) else: gchange = ReadLikes(dunikey, pod) gchange.readLikes(args.profile) -elif sys.argv[1] == "unlike": +elif cmd == "unlike": gchange = UnLikes(dunikey, pod) gchange.unLike(args.profile) diff --git a/zen/cesium-messaging/lib/__pycache__/cesium.cpython-36.pyc b/zen/cesium-messaging/lib/__pycache__/cesium.cpython-36.pyc index 045196ab6047208759f6f0e00f76ab557de758ae..7beadf938f8adf3c17786288ddf717e2195102dd 100644 GIT binary patch delta 2523 zcmZ`*TZ>y&6yE#X&&h3W$z;Z~9eSI|TskwIdLP8vN~`ElDx%JVCCxsQ$!VKRcMgi> z#Gt9IiWlnE(&C^XYPFys1O5aR9|~UZA^0RBh`tmbeeqi-Z5%~UIBS1v?c3UGt#6-v zv(i50Eu>Oj`OB}4J^jFE-cfDG{@K;~DSviF`eOF!x;)WXE0z7(QX`c0wYm&v&-k^C z)7rO#dWRp|IGnpfWd^`LpWn!YDtlJ}(^UdzLXK7fBo<@si3c3~$VA z`9$Mt9uBVR>|?Q0ayIUimV{WjSLF2f*P@#u;;Rv9%0C@3DdI#oJg` zr7eX6Sz!z3EMGQ-E4;I8*%AqnL~DzbNTYQ`PGm$MMz~^F^os!?PYjA7^d*G#2rK3{ zmUms_E!vfye!Ldm19%%3;ZMjy9`H76^QKc}O*i7Q5b?+re33<(oQO1F4cL(TA_G_l z*5$pC4r~CMauxHu$Q0%Xi#%bGP1rGZfIWp&>(5l#$Gm+@(w17y` z$W3|*x-EYS^~e_KwiXy|*0e)2up+z71Dmuet(T#3)MAakMJD=h-~rg3sO5@502Vkf z51~7YHn+%PhlUqf=mzi;F-U}oC=nzn9zm+jf;2Wrh8d9`VPRjCq@EDf5)6ouw$|1J z3kSQ_Hczk@v=N#|PNm{lCb7#X_D$^rxMkBeX>2$YrQ1Ai6K#G`Yi436GH{|V>Ohi?nt&S#-cdXJ=rLZKIonz&CE%a;Q8Mk_>RPkrmYL(^GP2;ifnKfTdBeQafM3qDf zqGN=mN<;RFT)s*@=OBt%`557N(usIzea)}QWilRyNOj!fx9#(5<+||YgKDOj{}(H^ zJTZV_#eP|gXV*%neE9~=ev^bEqrO&e$cv<2A`!DFCeT}?ZekIsuaS72#Ci2aaTh44%f%;YprU`N`W`OJxH?=pn+S@Wurl0-!iO!J9_S5L(j^x-f)^BId#p_PSQ( zRW2OT301nfTV+)yJnAKWiBx2WH1UcUMQp0Lux7!v;dNc)*R5>R3|YV<6Unk7qS?rj zyri~GjjHb^7q?x88xq`NzY0QgBsRrF9h|zb+wKO;UX%5e>Pf$2Hp+%c*28zI=+0w27{pe`_m1xb;(!3PAdJE6x1 z;*c4;Lfa9+kq`l5_qMTsGLZ#3P^-suu;X5kyy-*^BAj08R_Q9vD5vfr*(-4Q9;vU8 zc%K9n#DA81-;Hwrk3t?VyKzc3)#v}0Cas_Ci5yTT4Qj4bD+lZ4`(>%&f8R?QPa!g{B4cH zWZ*jH!hKb5nvofp!o#SOKq$@74xGTn9Sdz3_v>)?&SeN`O8q!}-tL$_IjkPoKBnq3 zmxr#C=X4~dJBGst;Cp%_zsKd8rKugW#a8*|$Hc=J!ZG*u0Kij5^#*SYB$@7L8|fpe zID)serW@jOLU(@TVt;K(euP;?UA}{+`)SUQ!RuyXovcKhj`>veBuHYHg!I+dvqSun zdUw8XcRYPSgTJv$Jcn32{7kYJ;D#TTbu2&+-4t|d#NIxs=I16`IxY#lsl!1NZtEy{ zy=g$RZ~+)_*95k^EDs&3PdH9&H<#osSgFhGql7+&D7tbx;awzllNcv4LE=Lahe&)% zB0iUtr&GtNNliFI(7X9A=%q-mZ7uWnI#{d8T delta 1871 zcmZWpO>7%Q6rP#=U)!-0+xa5|x1_Y2rcJ5SNVKWciXtSa+^UfZ6i~4|PU1~soAIiM zc3cD7LMstynNoxliP8$?(hKs1Ta^P6y&x5-7Ym6Sf)gi@xB&01Y5KR;e)G+nnfKm2 ze{aL(J9BP6k#N61_`^wZ=v(&~%jPE+YRl!xIZ@`5@6^O%qh2hP+b#A}nu#T~K044| z=pSSBj9M9do67dTgKOGIlMo_a1n_j>A>W1YGQx+dIF?p-NA{3YYJjqkQ9Nx?OV9n+6S>pA#t6P4g zE$e^JDHzfB^XU6HB_tpL^=U{#+O#U9X-g_bB$YO&Gek16O)}sNxGtuo4qOASi33st zt^+s30-STC!Hppz9d4qHTM@T`JFw4b0Wrn(c>)s`IN%WRSp~vU!eiYzI^c2K`M^8@ za|`A@FcKewCT9pw!Pq-PB7c1|B+z|B+HeIoFs18TcpcvkiSLA@84FzAN)M4BCS$l1 z#KBR5XF?V-PJ*7UHKZ|eo(x(DX$abO;DA&2M$||%%xruXR^W8ZpszSJptK31! z@;J&Bg^D8O>3OtfK)U^_8Xs6Sn_578DmAF0F7;WRc!LFXbNl{1S0SVTxsu;GGVJNo znc}HpP!u~)mTJ|YTn$bJ@75oxgR&a{{ zqW+rL(|_--*dKV`=&p73`s7$FBN;aqnV9CLx;B~JZLMfcLmEExBUq0EGiOO)`L^$H zXa(OKAlx13s+)iqVg>b{l~dNPIdx&zH>ukgxDNwswrRSWCd{@&Ul*m5{B-FE{O)G z`(6A3t*DxgajLQem9dIklpE^L-D#D`5ADUnzhR;_5JEFF&TM)*ezaT1#?D4LC^1}u z2TO+Ki!yyfy_Fx&v#QRuCWG`0Oc~PCfSXd|I&dAhC3X0pjlh;hl(eC4<+JpLx|@G$ z)7RjvoAMg6C~vcy_g84RriQ1y;Tu5zz!Wn;2-T@chpEYQ7FTahZGPdg+HrFK2eqS7 z?Pydx2DM{R8tmcPsqdzCv^qvv6dUD#9xF%BMmeGl9*v~wnT6=_Xu*q#DkfY*s3VLc zM1RR6m&Ae#ypp(yki8G;=(L>^m%!j-2KW)TsoiIfyPNH_9d|7^DK4oid)DYhwLUhY IUY*|lACAACkN^Mx diff --git a/zen/cesium-messaging/lib/__pycache__/likes.cpython-36.pyc b/zen/cesium-messaging/lib/__pycache__/likes.cpython-36.pyc index 9f3856654626149b1c842a850b774567ea93e190..0e8c938a3483a96bb49ef00667b5b39de144e9b2 100644 GIT binary patch delta 67 zcmexl+hE6Q%*)I5*Xcz3Sq%n;$CDcvMK>ztGb=mjXXNLm>ZcW@rs$XF7iAY0Bqpco XCl;3!>~{TDccxh delta 53 zcmZp$`((>&%*)FqqI4qutOf(aG^95@c=2G=#BhBVVvGk5dL|kZXI>liu%G?TyxE!EeX}3W8|O<;*zM)NN8jy~ zPTE>WgZH$g48}pmf{Pj?GU-TE1|u0Aw6q3#a7CtaaobdpFz{8yun6FmUafnV*-RlOvQvWF7XxGDh#vCeT?jNz1H3-=v8Qz4E#$!KQ` zFitT}GX@!*gn;e;#Oyu87-nz<7-5*<)4hWJvP*hlpyY;oz>=~z#DI!<| z1hKSg`*1gDGZ^|0P%%JYL^t<>GJ`uev=}NRZydPu?Dp#5eW+61JZd>;_MlX=B0O@c1dibB{`_ z_TDC@ynVJLt)Qcv=)s8Z5cxiM3l&2DDr^-p%=kFNy6^9*P%p1K!d0Kq$k4C^tN=6t z8=y0?jE9WHTuHtga2Lu2FlxZuZ-6(I@IUoF(+7s8RkFb9|a2pqd1<_!zD3E6RfeLOi@yiq*N5Rz(LcD8HR^( zlVP?%3#qVO%j)T@uEaG+M)WZ5wX_bJkJ5Z#s~kMU;CF3UGt|;DW?1vlaG#yFvrAE# Q)>SQK2npwML#=l42PH2cD*ylh delta 1127 zcmYk5%}-N75Wu^9R35ao*e^;|Xr)34O%-TC!4CwCs0b02Baa5cuhhEok?+m3v{XIv4-uv_rH1qVx$7;g`WNqpoDR+rj01zk&vXSz#oT`-r6W^wt9 zyrsKyU=@tg+EQ6&jGTF0>UiCA(5pL?y)0!mFV`WYl5KhXe9N95;y2F=F^3PltD+Zw zdq>0q4*M=mCb<-CDLE>O87nJ+tJimB;8v+(8ToWMZ+xV{v7+q05gV~xP) zfb;mtH!2pTzn|bMY|4!Qj}*o#Bm;mQh)c2CV5{!*Yc7^nT9Q9ha63? z%*ZoL#x=%D)w6r5$$pmQHtHb{mbyE{D&FsoCQg%aqakjBt1hg-OkF6E)uJ({;*v14 zk(epsfv^vMbieiUU6V1R(rh%}zH|8Y9r^+v!cpfuEm3Fk1Q+mEI7+V_j(FXw6V(y< z{BQ=RBeA>ux70s?36@SUxRGI!F~?9(&F=^NZnef-p`tfuB~7r(h8DvprVG+A;3PY# zW1eFv$e3lQ&WMntJFT@!X{}=9EGVQa)P|9LNBG9;zs_Rm2!lVnZZA`x%WTbF_lB!v WtZCEh8Cj~BRW(=4B diff --git a/zen/cesium-messaging/lib/cesium.py b/zen/cesium-messaging/lib/cesium.py index e9d4978..62d846b 100644 --- a/zen/cesium-messaging/lib/cesium.py +++ b/zen/cesium-messaging/lib/cesium.py @@ -199,7 +199,7 @@ class SendToCesium: # Generate pseudo-random nonce nonce=[] - for i in range(32): + for _ in range(32): nonce.append(random.choice(string.ascii_letters + string.digits)) self.nonce = base64.b64decode(''.join(nonce)) @@ -378,7 +378,7 @@ class Profiles: sys.exit(1) # Configure JSON document SET to send - def configDocSet(self, name, description, city, address, pos, socials): + def configDocSet(self, name, description, city, address, pos, socials, avatar): timeSent = int(time.time()) data = {} @@ -396,6 +396,12 @@ class Profiles: data['socials'].append({}) data['socials'][0]['type'] = "web" data['socials'][0]['url'] = socials + if avatar: + avatar = open(avatar, 'rb').read() + avatar = base64.b64encode(avatar).decode() + data['avatar'] = {} + data['avatar']['_content'] = avatar + data['avatar']['_content_type'] = "image/png" data['time'] = timeSent data['issuer'] = self.pubkey data['version'] = 2 @@ -420,7 +426,12 @@ class Profiles: return finalDoc # Configure JSON document GET to send - def configDocGet(self, profile, scope='title'): + def configDocGet(self, profile, scope='title', getAvatar=None): + + if getAvatar: + avatar = "avatar" + else: + avatar = "avatar._content_type" data = { "query": { @@ -444,7 +455,7 @@ class Profiles: } },"from":0, "size":100, - "_source":["title","avatar._content_type","description","city","address","socials.url","creationTime","membersCount","type"], + "_source":["title", avatar,"description","city","address","socials.url","creationTime","membersCount","type"], "indices_boost":{"user":100,"page":1,"group":0.01 } } @@ -453,6 +464,35 @@ class Profiles: return document + # Configure JSON document SET to send + def configDocErase(self): + timeSent = int(time.time()) + + data = {} + data['time'] = timeSent + data['id'] = self.pubkey + data['issuer'] = self.pubkey + data['version'] = 2 + data['index'] = "user" + data['type'] = "profile" + + document = json.dumps(data) + + # Generate hash of document + hashDoc = sha256(document.encode()).hexdigest().upper() + + # Generate signature of document + signature = fmt["64"](sign(hashDoc.encode(), get_privkey(self.dunikey, "pubsec"))[:-len(hashDoc.encode())]).decode() + + # Build final document + data = {} + data['hash'] = hashDoc + data['signature'] = signature + signJSON = json.dumps(data) + finalJSON = {**json.loads(signJSON), **json.loads(document)} + finalDoc = json.dumps(finalJSON) + + return finalDoc def sendDocument(self, document, type): @@ -465,6 +505,8 @@ class Profiles: reqQuery = '{0}/user/profile?pubkey={1}/_update?pubkey={1}'.format(self.pod, self.pubkey) elif type == 'get': reqQuery = '{0}/user,page,group/profile,record/_search'.format(self.pod) + elif type == 'erase': + reqQuery = '{0}/history/delete'.format(self.pod) result = requests.post(reqQuery, headers=headers, data=document) if result.status_code == 200: @@ -485,14 +527,14 @@ class Profiles: return json.dumps(final, indent=2) - def set(self, name=None, description=None, ville=None, adresse=None, position=None, site=None): - document = self.configDocSet(name, description, ville, adresse, position, site) + def set(self, name=None, description=None, ville=None, adresse=None, position=None, site=None, avatar=None): + document = self.configDocSet(name, description, ville, adresse, position, site, avatar) result = self.sendDocument(document,'set') print(result) return result - def get(self, profile=None): + def get(self, profile=None, avatar=None): if not profile: profile = self.pubkey if not re.match(PUBKEY_REGEX, profile) or len(profile) > 45: @@ -500,7 +542,7 @@ class Profiles: else: scope = '_id' - document = self.configDocGet(profile, scope) + document = self.configDocGet(profile, scope, avatar) resultJSON = self.sendDocument(document, 'get') result = self.parseJSON(resultJSON) @@ -508,8 +550,8 @@ class Profiles: return result def erase(self): - document = self.configDocSet(None, None, None, None, None, None) - result = self.sendDocument(document,'set') + document = self.configDocErase() + result = self.sendDocument(document,'erase') print(result) return result \ No newline at end of file