aboutsummaryrefslogtreecommitdiff
path: root/python/olm/__main__.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2016-05-25 15:46:50 +0100
committerRichard van der Hoff <richard@matrix.org>2016-05-25 15:46:50 +0100
commit27b57c8d8830ebd37ad304703ccb61390d4b0f36 (patch)
tree752f4c117ccf73c65ebcc853a17759f1ed4a5fa7 /python/olm/__main__.py
parent54d43010c808b56caa703696a036df18d2b74575 (diff)
parentfae8dacab5233c46f09e7d869afadaead2842609 (diff)
Merge branch 'rav/more_group_chat/1'
Diffstat (limited to 'python/olm/__main__.py')
-rwxr-xr-xpython/olm/__main__.py105
1 files changed, 103 insertions, 2 deletions
diff --git a/python/olm/__main__.py b/python/olm/__main__.py
index 35ccd01..a34d52a 100755
--- a/python/olm/__main__.py
+++ b/python/olm/__main__.py
@@ -10,8 +10,7 @@ import yaml
from . import *
-
-if __name__ == '__main__':
+def build_arg_parser():
parser = argparse.ArgumentParser()
parser.add_argument("--key", help="Account encryption key", default="")
commands = parser.add_subparsers()
@@ -242,5 +241,107 @@ if __name__ == '__main__':
decrypt.set_defaults(func=do_decrypt)
+ outbound_group = commands.add_parser("outbound_group", help="Create an outbound group session")
+ outbound_group.add_argument("session_file", help="Local group session file")
+ outbound_group.set_defaults(func=do_outbound_group)
+
+ group_credentials = commands.add_parser("group_credentials", help="Export the current outbound group session credentials")
+ group_credentials.add_argument("session_file", help="Local outbound group session file")
+ group_credentials.add_argument("credentials_file", help="File to write credentials to (default stdout)",
+ type=argparse.FileType('w'), nargs='?',
+ default=sys.stdout)
+ group_credentials.set_defaults(func=do_group_credentials)
+
+ group_encrypt = commands.add_parser("group_encrypt", help="Encrypt a group message")
+ group_encrypt.add_argument("session_file", help="Local outbound group session file")
+ group_encrypt.add_argument("plaintext_file", help="Plaintext file (default stdin)",
+ type=argparse.FileType('rb'), nargs='?',
+ default=sys.stdin)
+ group_encrypt.add_argument("message_file", help="Message file (default stdout)",
+ type=argparse.FileType('w'), nargs='?',
+ default=sys.stdout)
+ group_encrypt.set_defaults(func=do_group_encrypt)
+
+ inbound_group = commands.add_parser(
+ "inbound_group",
+ help=("Create an inbound group session based on credentials from an "+
+ "outbound group session"))
+ inbound_group.add_argument("session_file", help="Local inbound group session file")
+ inbound_group.add_argument("credentials_file",
+ help="File to read credentials from (default stdin)",
+ type=argparse.FileType('r'), nargs='?',
+ default=sys.stdin)
+ inbound_group.set_defaults(func=do_inbound_group)
+
+ group_decrypt = commands.add_parser("group_decrypt", help="Decrypt a group message")
+ group_decrypt.add_argument("session_file", help="Local inbound group session file")
+ group_decrypt.add_argument("message_file", help="Message file (default stdin)",
+ type=argparse.FileType('r'), nargs='?',
+ default=sys.stdin)
+ group_decrypt.add_argument("plaintext_file", help="Plaintext file (default stdout)",
+ type=argparse.FileType('wb'), nargs='?',
+ default=sys.stdout)
+ group_decrypt.set_defaults(func=do_group_decrypt)
+ return parser
+
+def do_outbound_group(args):
+ if os.path.exists(args.session_file):
+ sys.stderr.write("Session %r file already exists" % (
+ args.session_file,
+ ))
+ sys.exit(1)
+ session = OutboundGroupSession()
+ with open(args.session_file, "wb") as f:
+ f.write(session.pickle(args.key))
+
+def do_group_encrypt(args):
+ session = OutboundGroupSession()
+ with open(args.session_file, "rb") as f:
+ session.unpickle(args.key, f.read())
+ plaintext = args.plaintext_file.read()
+ message = session.encrypt(plaintext)
+ with open(args.session_file, "wb") as f:
+ f.write(session.pickle(args.key))
+ args.message_file.write(message)
+
+def do_group_credentials(args):
+ session = OutboundGroupSession()
+ with open(args.session_file, "rb") as f:
+ session.unpickle(args.key, f.read())
+ result = {
+ 'message_index': session.message_index(),
+ 'session_key': session.session_key(),
+ }
+ json.dump(result, args.credentials_file, indent=4)
+
+def do_inbound_group(args):
+ if os.path.exists(args.session_file):
+ sys.stderr.write("Session %r file already exists\n" % (
+ args.session_file,
+ ))
+ sys.exit(1)
+ credentials = json.load(args.credentials_file)
+ for k in ('message_index', 'session_key'):
+ if not k in credentials:
+ sys.stderr.write("Credentials file is missing %s\n" % k)
+ sys.exit(1);
+
+ session = InboundGroupSession()
+ session.init(credentials['message_index'], credentials['session_key'])
+ with open(args.session_file, "wb") as f:
+ f.write(session.pickle(args.key))
+
+def do_group_decrypt(args):
+ session = InboundGroupSession()
+ with open(args.session_file, "rb") as f:
+ session.unpickle(args.key, f.read())
+ message = args.message_file.read()
+ plaintext = session.decrypt(message)
+ with open(args.session_file, "wb") as f:
+ f.write(session.pickle(args.key))
+ args.plaintext_file.write(plaintext)
+
+if __name__ == '__main__':
+ parser = build_arg_parser()
args = parser.parse_args()
args.func(args)