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 045196a..7beadf9 100644 Binary files a/zen/cesium-messaging/lib/__pycache__/cesium.cpython-36.pyc and b/zen/cesium-messaging/lib/__pycache__/cesium.cpython-36.pyc differ diff --git a/zen/cesium-messaging/lib/__pycache__/likes.cpython-36.pyc b/zen/cesium-messaging/lib/__pycache__/likes.cpython-36.pyc index 9f38566..0e8c938 100644 Binary files a/zen/cesium-messaging/lib/__pycache__/likes.cpython-36.pyc and b/zen/cesium-messaging/lib/__pycache__/likes.cpython-36.pyc differ diff --git a/zen/cesium-messaging/lib/__pycache__/natools.cpython-36.pyc b/zen/cesium-messaging/lib/__pycache__/natools.cpython-36.pyc index a750481..848ef62 100644 Binary files a/zen/cesium-messaging/lib/__pycache__/natools.cpython-36.pyc and b/zen/cesium-messaging/lib/__pycache__/natools.cpython-36.pyc differ 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