laid base for expiring links

.drone.yml

@@ -1,9 +1,26 @@
 pipeline:
- modules:
-  image: python:2.7
+ pretty:
+  image: unibeautify/autopep8
   commands:
-    - ./make-modules.sh
+   - autopep8 imports -r --in-place
+   - autopep8 main.py --in-place
+ modules:
+  image: python:3.5
+  commands:
+    - rm -rf modules
+    - mkdir -p .pip3
+    - ./make-modules.sh --cache-dir .pip3
  package:
   image: kramos/alpine-zip
   commands:
     - zip seafile.zip -r modules icon.png main.py metadata.xml settings.ui
+ release:
+  image: plugins/gitea-release
+  api_key:
+  from_secret: gitea_token
+  base_url: https://git.shimun.net
+  files: seafile.zip
+  checksum:
+   - sha256
+  when:
+   event: tag

.gitignore

@@ -0,0 +1,4 @@
+modules
+.pip3
+seafile.zip
+lib

imports/encryptedscreenshot.py

@@ -1,21 +1,28 @@
-import bson, scrypt
+from Crypto.Signature import PKCS1_v1_5
+from Crypto.Hash import SHA256
+import bson  # , scrypt
 
 from Crypto.Cipher import AES
 from Crypto.Util import Counter
 from Crypto.PublicKey import RSA
 from Crypto.PublicKey import DSA
 from salsa20 import Salsa20_keystream
-import os, struct, time, hashlib, hashlib, random
+import os
+import struct
+import time
+import hashlib
+import hashlib
+import random
+import binascii
 
 
 class EncryptedScreenshot:
-    def __init__(self, metadata,id=None,signer=None,password_encryptor=None):
+    def __init__(self, metadata, password=None, id=None, signer=None, password_encryptor=None):
         def rand(len):
             return ''.join(
                 random.choice("1234567890ABCDEFGHIJKLMNOPQRSTUWVXYZabcdefghijklmnopqrstuwvxyz") for _ in range(len))
 
-        self.password = rand(16)
-        print("Passphrase %s" % str(bytearray(self.passphrase())).encode("hex"))
+        self.password = (password or rand(16))
         self.id = id
         if id is None:
             self.id = rand(8)
@@ -25,16 +32,18 @@ class EncryptedScreenshot:
         self.password_encryptor = password_encryptor
 
     def caesar_encrypted_password(self):
-        caesar_key = reduce(lambda sum,charcode: sum+charcode, map(ord,list(self.id)))
+        caesar_key = reduce(lambda sum, charcode: sum +
+                            charcode, map(ord, list(self.id)))
         caesar_plaintext = map(ord, self.password)
         caesar_ciphertext = Caesar().encrypt(caesar_plaintext, caesar_key)
         return ''.join(map(chr, caesar_ciphertext))
 
     def passphrase(self):
         # new ScryptParameters(64, 8, 1,32, new Uint8List.fromList(new List<int>()))
-        print("Password units: %s" % (map(ord, self.password.encode("utf-8")),))
+        print("Password units: %s" %
+              (map(ord, self.password.encode("utf-8")),))
         sha = hashlib.sha256()
-        sha.update(self.password)
+        sha.update(self.password.encode("utf-8"))
         return sha.digest()  # scrypt.hash(self.password.encode("utf-8"), '', 64, 8, 1, 32)
 
     def assemble(self, file):
@@ -42,39 +51,44 @@ class EncryptedScreenshot:
         self.metadata["hash"] = image_digest
         unencrypted_metadata = bson.dumps(self.metadata)
         if len(unencrypted_metadata) % 16 != 0:
-            unencrypted_metadata += ' ' * (16 - len(unencrypted_metadata) % 16)
+            unencrypted_metadata += b' ' * \
+                (16 - len(unencrypted_metadata) % 16)
         (encryptor, iv) = self.encryptor(len(unencrypted_metadata))
-        encrypted_metadata = []
+        encrypted_metadata = b''
 
         encrypted_metadata += encryptor(unencrypted_metadata)
 
-        encrypted_metadata = iv + str(bytearray(encrypted_metadata))
+        encrypted_metadata = iv + encrypted_metadata
 
-        print("Metadata: %s" % str(encrypted_metadata).encode("base64").replace("\n", ""))
-        print("%s %s" % (str(encrypted_metadata[:16]).encode("hex"), str(encrypted_metadata[16:]).encode("hex")))
-        print("Unencrypted: %s" % (unencrypted_metadata.encode("hex")))
-        print("Password %s" % self.password)
+        #print("Metadata: %s" % str(encrypted_metadata).encode("base64").replace("\n", ""))
+        #print("%s %s" % (str(encrypted_metadata[:16]).encode("hex"), str(encrypted_metadata[16:]).encode("hex")))
+        #print("Unencrypted: %s" % (unencrypted_metadata.encode("hex")))
+        #print("Password %s" % self.password)
 
-        print(bson.loads(unencrypted_metadata))
+        # print(bson.loads(unencrypted_metadata))
 
         fields = {
             "image": encrypted_image,
             "metadata_encryption": self.metadata_encryption,
-            "metadata": encrypted_metadata if self.metadata_encryption else self.metadata
+            "metadata": encrypted_metadata if self.metadata_encryption else self.metadata,
+            "public_metadata": self.metadata["public"]
         }
 
         if self.signer is not None:
-            fields["signature"] = self.signer.signature(encrypted_metadata if self.metadata_encryption else bson.dumps(self.metadata))
+            fields["signature"] = self.signer.signature(
+                encrypted_metadata if self.metadata_encryption else bson.dumps(self.metadata))
 
         if self.password_encryptor is not None:
-            fields["password"] = self.password_encryptor.encrypt_password(self.password)
+            fields["password"] = self.password_encryptor.encrypt_password(
+                self.password)
 
         return bson.dumps(fields)
 
     def encryptor(self, length=0):
         iv = os.urandom(16)
-        ctr = Counter.new(128, initial_value=long(iv.encode("hex"), 16))
-        print("IV: %s" % iv.encode("hex"))
+        nonce = int(binascii.hexlify(iv), 16)
+        ctr = Counter.new(128, initial_value=nonce)  # initial_value = nonce)
+        print("IV: %s" % binascii.hexlify(iv))
         cipher = AES.new(self.passphrase(), AES.MODE_CTR, counter=ctr)
 
         # salsa
@@ -94,7 +108,7 @@ class EncryptedScreenshot:
     def encrypt(self, file):
         filesize = os.path.getsize(file)
         (encryptor, iv) = self.encryptor(filesize)
-        binary = []
+        binary = b''
         digest = hashlib.sha256()
         with open(file, 'rb') as infile:
             # binary += struct.pack('<Q', filesize)
@@ -106,10 +120,8 @@ class EncryptedScreenshot:
                     pass  # chunk += ' ' * (16 - len(chunk) % 16)
                 digest.update(chunk)
                 binary += encryptor(chunk)
-        return (digest.digest(), iv + str(bytearray(binary)))
+        return (digest.digest(), iv + binary)
 
-from Crypto.Signature import PKCS1_v1_5
-from Crypto.Hash import SHA256
 
 class Signer:
 
@@ -130,8 +142,8 @@ class Signer:
     def signature(self, data):
         signed = self.sign(data)
         return {"signed-hash": signed,
-                "signature-algorithm": "SHA-256/%s" % unicode("RSA" if self.mode == RSA else "DSA"),
-                "key-id": unicode(self.privateKeyId)
+                "signature-algorithm": "SHA-256/%s" % ("RSA" if self.mode == RSA else "DSA"),
+                "key-id": (self.privateKeyId)
                 }
 
 
@@ -152,6 +164,7 @@ class EncryptedPassword:
                 "password": self.encrypt(password)
                 }
 
+
 class Caesar:
 
     def __init__(self, charset=map(ord, list("1234567890ABCDEFGHIJKLMNOPQRSTUWVXYZabcdefghijklmnopqrstuwvxyz"))):
@@ -181,7 +194,8 @@ if __name__ == "__main__":
                                     password_encryptor=EncryptedPassword(RSA.importKey(publicKey.decode("base64")), "PUBLIC"))
     fixed_id = encrypted.id  # "W9u9Zm0u"
     print(len(encrypted.passphrase()))
-    out = open("/home/marvin/Dokumente/IdeaProjects/EncryptedScreencloud/Frontend/WebApp/web/data/" + fixed_id, 'wb')
+    out = open(
+        "/home/marvin/Dokumente/IdeaProjects/EncryptedScreencloud/Frontend/WebApp/web/data/" + fixed_id, 'wb')
     assembled = encrypted.assemble("5x5red.png")
     out.write(assembled)
     b = bson.loads(assembled)
@@ -189,11 +203,14 @@ if __name__ == "__main__":
     print(b)
     # print(assembled.encode("base64").replace("\n","")
     print("http://localhost:8080/#%s%s" % (fixed_id, encrypted.password))
-    caesar_key = reduce(lambda sum,charcode: sum+charcode, map(ord,list(fixed_id)))
+    caesar_key = reduce(lambda sum, charcode: sum +
+                        charcode, map(ord, list(fixed_id)))
     caesar_plaintext = map(ord, encrypted.password)
     caesar_ciphertext = Caesar().encrypt(caesar_plaintext, caesar_key)
     assert caesar_plaintext == Caesar().decrypt(caesar_ciphertext, caesar_key)
-    print("caesar_key=%s %s -> %s" % (caesar_key,encrypted.password,''.join(map(chr,caesar_ciphertext))))
-    print("http://localhost:8080/#%s%sC" % (fixed_id, encrypted.caesar_encrypted_password()))
+    print("caesar_key=%s %s -> %s" %
+          (caesar_key, encrypted.password, ''.join(map(chr, caesar_ciphertext))))
+    print("http://localhost:8080/#%s%sC" %
+          (fixed_id, encrypted.caesar_encrypted_password()))
     print("http://localhost:8080/#%s" % (fixed_id, ))
     out.close()

imports/hashderive.py

@@ -0,0 +1,33 @@
+import hashlib
+
+import binascii
+
+
+class HashDerivedKey:
+
+    @staticmethod
+    def from_hex(hex_str):
+        return HashDerivedKey(bytes(bytearray.fromhex(hex_str)))
+
+    def __init__(self, master):
+        def ensure_bytes(b):
+            assert isinstance(b, bytes)
+            return b
+        ensure_bytes(master)
+
+        def derive(seed):
+            ensure_bytes(seed)
+            sha = hashlib.sha256()
+            sha.update(master)
+            sha.update(seed)
+            return sha.digest()
+
+        def hex(b): return binascii.hexlify(b).decode("utf-8")
+        self.master = master
+        self.master_hex = lambda: hex(master)
+        self.derive = derive
+        self.derive_hex = lambda seed: hex(derive(seed))
+
+    def derive_metadata(self, seed):
+        key = self.derive(seed)
+        return (key, {"key_seed": binascii.hexlify(seed).decode("utf-8")})

imports/processors.py

@@ -1,29 +1,50 @@
 import time
 
 from encryptedscreenshot import EncryptedScreenshot, Signer
-import getpass, os
+from hashderive import HashDerivedKey
+import getpass
+import os
+import sys
 from PythonQt.QtGui import QInputDialog
 from PythonQt.QtCore import QSettings
 from seafapi import *
 
+
 class Processor:
 
+    def name(self):
+        pass
+
     def configure(self, parent):
         pass
 
     def is_configured(self):
         return True
 
-    def upload(self,file):
+    def load_settings(self, settings):
         pass
 
+    def save_settings(self, settings):
+        pass
+
+    def upload(self, file, name):
+        pass
+
+
 class DummyProcessor(Processor):
 
+    def name(self):
+        return None
+
     def is_configured(self):
         return False
 
+
 class DefaultProcessor(Processor):
 
+    def name(self):
+        return "default"
+
     def __init__(self, seaf_lib, lib_path):
         self.seaf_lib = seaf_lib
         self.lib_path = lib_path
@@ -31,27 +52,31 @@ class DefaultProcessor(Processor):
     def upload(self, file, name):
         return self.seaf_lib.upload(file, name, self.lib_path).share()
 
+
 class EncryptedProcessor(Processor):
 
+    def name(self):
+        return "enc"
+
     def __init__(self, seaf_lib, lib_path):
         self.seaf_lib = seaf_lib
         self.lib_path = lib_path
+        self.host = None
+        self.derived_key = HashDerivedKey(os.urandom(32))
         self.load_settings()
-        self.host = ""
 
-    def load_settings(self):
-        settings = QSettings()
-        settings.beginGroup("uploaders")
-        settings.beginGroup("seafile")
-        self.host = settings.value("encscreen-url", "")
+    def load_settings(self, settings=QSettings()):
+        self.host = settings.value("encscreen-url", None)
+        if settings.value("encscreen-derived-key", None):
+            self.derived_key = HashDerivedKey.from_hex(
+                settings.value("encscreen-derived-key", None))
         settings.endGroup()
         settings.endGroup()
 
-    def save_settings(self):
-        settings = QSettings()
-        settings.beginGroup("uploaders")
-        settings.beginGroup("seafile")
+    def save_settings(self, settings=QSettings()):
         settings.setValue("encscreen-url", self.host)
+        if self.derived_key:
+            settings.setValue(self.derived_key.master_hex())
         settings.endGroup()
         settings.endGroup()
 
@@ -59,21 +84,35 @@ class EncryptedProcessor(Processor):
         return self.host is not None and self.host != ""
 
     def configure(self, parent):
-        self.host = QInputDialog.getText(parent, 'Encscreen Server Setup', 'Enter server url (ex. https://servertld/s#%id%key):', text="https://screens.shimun.net/s#%id%key")
+        self.host = QInputDialog.getText(parent, 'Encscreen Server Setup', 'Enter server url (ex. https://servertld/s#%id%key):',
+                                         text=(self.host or "https://screens.shimun.net/s#%id%key"))
+        master = QInputDialog.getText(parent, 'Encscreen Master Key Setup', 'Enter master key (hex encoded):', text=(
+            self.derived_key.master_hex() if self.derived_key else "<random>"))
+        try:
+            self.derived_key = HashDerivedKey.from_hex(master)
+        except:
+            self.derived_key = HashDerivedKey(os.urandom(32))
         self.save_settings()
 
     def upload(self, file, name):
-        enrypted = EncryptedScreenshot({
-            "owner": unicode(getpass.getuser()),
-            "format": unicode(str(file).split('.')[-1]),
-            "title": unicode(name),
+        def derive():
+            seed = os.urandom(16)
+            (_, key_meta) = self.derived_key.derive_metadata(seed)
+            return (self.derived_key.derive_hex(seed)[0:16], key_meta)
+        (key, key_meta) = derive()
+        enrypted = EncryptedScreenshot(metadata={
+            "owner": getpass.getuser(),
+            "format": str(file).split('.')[-1],
+            "title": name,
             "timestamp": int(time.time() * 1000),
-            "size": os.stat(file).st_size
-        },signer=Signer.default())
+            "size": os.stat(file).st_size,
+            "public": key_meta
+        }, password=key, signer=Signer.default())
         tmpHandle = open(file + "c", 'wb')
         tmpHandle.write(enrypted.assemble(file))
         tmpHandle.close()
-        seaf_file = self.seaf_lib.upload(file + "c",name + ".enc",self.lib_path)
+        seaf_file = self.seaf_lib.upload(
+            file + "c", name + ".enc", self.lib_path)
         if not seaf_file:
             return
         seaf_link = seaf_file.share()
@@ -82,5 +121,3 @@ class EncryptedProcessor(Processor):
             return self.host.replace('%id', id).replace('%key', "%s" % enrypted.password)
         else:
             return False
-
-

imports/seafapi.py

@@ -1,27 +1,33 @@
-import time, os
+import time
+import os
 import requests
 
+
 class SeafileClient:
 
     def __init__(self, server, username, password=None, token=None):
         self.server = server
         self.token = token
+        self.session = requests.Session()
+        if token:
+            self.session.headers.update(
+                {'Authorization': "Token %s" % self.token.token})
         self.login = (username, password)
 
     def api_endpoint(self):
-        return "%s/api2/" % self.server
+        return "%s/api2" % self.server
 
-    def ping(self):
+    def ping(self, auth=False):
         try:
-            return requests.get("%s/ping" % self.api_endpoint()).text == "pong"
+            return self.session.get("%s%s/ping" % (self.api_endpoint(), "/auth" if auth else "")).text == "\"pong\""
         except:
             return False
 
-
     def obtain_token(self):
         user, passw = self.login
         try:
-            req=requests.post("%s/auth-token/" % self.api_endpoint(), data = {'username': user, 'password': passw })
+            req = requests.post("%s/auth-token/" % self.api_endpoint(),
+                                data={'username': user, 'password': passw})
             json = req.json()
             if "non_field_errors" in json:
                 print(json["non_field_errors"])
@@ -32,22 +38,30 @@ class SeafileClient:
 
     def authorize(self):
         self.token = self.obtain_token()
+        if self.token:
+            self.session.headers.update(
+                {'Authorization': "Token %s" % self.token.token})
         return self.token != False
 
     # curl -H 'Authorization: Token 24fd3c026886e3121b2ca630805ed425c272cb96' -H 'Accept: application/json; indent=4' https://cloud.seafile.com/api2/repos/
     def libraries(self):
-        resp=requests.get("%s/repos/" % self.api_endpoint(), headers = {'Authorization': "Token %s" % self.token.token, 'Accept': 'application/json; indent=4' })
-        if not resp.status_code == 200: return
+        resp = self.session.get("%s/repos/" % self.api_endpoint(), headers={
+                                'Authorization': "Token %s" % self.token.token, 'Accept': 'application/json; indent=4'})
+        if not resp.status_code == 200:
+            return
         libraries = []
         for lib in resp.json():
             if not lib['encrypted']:
-                libraries.append(SeafileLibrary(self,lib['id'],lib['name'],lib['owner']))
+                libraries.append(SeafileLibrary(
+                    self, lib['id'], lib['name'], lib['owner']))
         return libraries
 
+
 class SeafileLibrary:
 
     def __init__(self, client, id, name, owner):
         self.client = client
+        self.session = client.session
         self.id = id
         self.name = name
         self.owner = owner
@@ -59,13 +73,16 @@ class SeafileLibrary:
         def obtain_link():
             # curl -H "Authorization: Token f2210dacd9c6ccb8133606d94ff8e61d99b477fd" https://cloud.seafile.com/api2/repos/99b758e6-91ab-4265-b705-925367374cf0/upload-link/
             print("%s/upload-link" % self.api_endpoint())
-            quoted = requests.get("%s/upload-link" % self.api_endpoint(), headers = {'Authorization': "Token %s" % self.client.token.token,}).text
+            quoted = self.session.get("%s/upload-link" % self.api_endpoint(), headers={
+                                      'Authorization': "Token %s" % self.client.token.token, }).text
             return quoted[1:-1]
 
         # curl -H "Authorization: Token f2210dacd9c6ccb8133606d94ff8e61d99b477fd" -F file=@test.txt -F filename=test.txt -F parent_dir=/ http://cloud.seafile.com:8082/upload-api/73c5d117-3bcf-48a0-aa2a-3f48d5274ae3
-        resp = requests.post(link or obtain_link() ,
-                      files={'file': (file_name,open(file, 'rb')), 'parent_dir': directory, 'target_file': "%s/%s" % (directory,file_name)},
-                      headers = {'Authorization': "Token %s" % self.client.token.token,}
+        resp = self.session.post(link or obtain_link(),
+                                 files={'file': (file_name, open(
+                                     file, 'rb')), 'parent_dir': directory, 'target_file': "%s/%s" % (directory, file_name)},
+                                 headers={
+                                     'Authorization': "Token %s" % self.client.token.token, }
                                  )
         if resp.status_code == 200:
             return SeafileFile(self, ("%s/%s" % (directory, file_name)).replace('//', '/').replace('//', '/'), resp.text)
@@ -73,7 +90,8 @@ class SeafileLibrary:
 
     # curl -H 'Authorization: Token f2210dacd3606d94ff8e61d99b477fd' -H 'Accept: application/json; charset=utf-8; indent=4' https://cloud.seafile.com/api2/repos/dae8cecc-2359-4d33-aa42-01b7846c4b32/file/detail/?p=/foo.c
     def file_info(self, path):
-        resp=requests.get("%s/file/detail/?p=%s" % (self.api_endpoint(),path), headers = {'Authorization': "Token %s" % self.token.token, 'Accept': 'application/json; indent=4' })
+        resp = self.session.get("%s/file/detail/?p=%s" % (self.api_endpoint(), path), headers={
+                                'Authorization': "Token %s" % self.token.token, 'Accept': 'application/json; indent=4'})
         if resp.status_code == 200:
             json = resp.json()
             return SeafileFile(self, path, json['id'], json['size'])
@@ -82,30 +100,38 @@ class SeafileLibrary:
     def __str__(self):
         return "%s on %s by %s" % (self.name, self.client.server, self.owner)
 
+
 class SeafileFile:
 
     def __init__(self, library, path, id, size=0):
         self.id = id
         self.path = path
         self.library = library
+        self.session = library.session
         self.size = size
 
     # curl -v  -X PUT -d "p=/foo.md" -H 'Authorization: Token f2210dacd9c6ccb8133606d94ff8e61d99b477fd' -H 'Accept: application/json; indent=4' https://cloud.seafile.com/api2/repos/afc3b694-7d4c-4b8a-86a4-89c9f3261b12/file/shared-link/
-    def share(self):
-        resp = requests.put("%s/repos/%s/file/shared-link/" % (self.library.client.api_endpoint(),self.library.id),
-                            headers = {'Authorization': "Token %s" % self.library.client.token.token, 'Accept': 'application/json; indent=4'},
+    def share(self,expire_days=None):
         data = {'p': self.path}
+        if expire_days and not expire_days == 0:
+            data['expire'] = expire_days
+        resp = self.session.put("%s/repos/%s/file/shared-link/" % (self.library.client.api_endpoint(), self.library.id),
+                                headers={'Authorization': "Token %s" % self.library.client.token.token,
+                                         'Accept': 'application/json; indent=4'},
+                                data = data
                                 )
         return resp.headers.get("location")
 
     def update(self, file):
         def obtain_link():
             # curl -H "Authorization: Token f2210dacd9c6ccb8133606d94ff8e61d99b477fd" https://cloud.seafile.com/api2/repos/99b758e6-91ab-4265-b705-925367374cf0/upload-link/
-            quoted = requests.get("%s/update-link" % self.library.api_endpoint(), headers = {'Authorization': "Token %s" % self.library.client.token.token,}).text
+            quoted = self.session.get("%s/update-link" % self.library.api_endpoint(), headers={
+                                      'Authorization': "Token %s" % self.library.client.token.token, }).text
             return quoted[1:-1]
         directory, name = os.path.split(self.path)
         return self.library.upload(file, name, directory, obtain_link())
 
+
 class SeafileToken:
 
     def __init__(self, username, token):
@@ -114,5 +140,3 @@ class SeafileToken:
 
     def __str__(self):
         return "%s@%s" % (self.token, self.username)
-
-

imports/settings.py

@@ -0,0 +1,76 @@
+from processors import DummyProcessor, DefaultProcessor, EncryptedProcessor
+from seafapi import *
+
+
+class SeafScreencloudSettings:
+
+    def __init__(self):
+        self.processor = DummyProcessor()
+        self.library = None  # (Id, Name)
+        self.library_path = "/"
+        self.token = None  # SefileToken
+        self.upload_scheme = "regular"
+        self.url = None
+        self.link_expiry = None
+
+    def _client(self):
+        if self.token and self.url:
+            client = SeafileClient(
+                self.url, self.token.username, token=self.token)
+
+            def c():
+                return client
+            self.client = c
+            return c()
+        return None
+
+    def load(self, settings):
+
+        self.client = self._client
+
+        self.url = settings.value("seafile-url", None)
+        self.link_expiry = int(settings.value("link-expiry", None))
+        lib = tuple(settings.value("library", "/").split("/"))
+        (id, name) = lib
+        if len(id) == 0 or self.client() == None:
+            self.library = None
+        else:
+            self.library = SeafileLibrary(self.client(), id, name, name)
+        self.library_path = settings.value("library-path", "/")
+        (user, tkn) = (settings.value("auth-username", None),
+                       settings.value("auth-token", None))
+        if user == None or tkn == None:
+            self.token = None
+        else:
+            self.token = SeafileToken(user, tkn)
+
+        processors = {
+            "default": DefaultProcessor,
+            "enc": EncryptedProcessor
+        }
+
+        if settings.value("processor", None) in processors:
+            self.processor = processors[settings.value("processor", None)](
+                self.library, self.library_path)
+            self.processor.load_settings(settings)
+        elif self.library:
+            self.processor = DefaultProcessor(self.library, self.library_path)
+        else:
+            self.processor = DummyProcessor()
+
+        # TODO:
+        self.upload_scheme = "regular"
+
+    def save(self, settings):
+        settings.setValue("seafile-url", self.url)
+        if self.library is not None:
+            settings.setValue("library", "%s/%s" %
+                              (self.library.id, self.library.name))
+        if self.link_expiry is not None:
+            settings.setValue("link-expiry", self.link_expiry)                    
+        settings.setValue("library-path", self.library_path)
+        if self.token != None:
+            settings.setValue("auth-username", self.token.username)
+            settings.setValue("auth-token", self.token.token)
+        settings.setValue("processor", self.processor.name())
+        self.processor.save_settings(settings)

main.py

@@ -6,6 +6,7 @@ from PythonQt.QtUiTools import QUiLoader
 from multiprocessing import Pool, Process
 
 from seafapi import *
+from settings import SeafScreencloudSettings
 from processors import DummyProcessor, DefaultProcessor, EncryptedProcessor
 ###############################
 ## This is a temporary fix, should be removed when a newer python version is used ##
@@ -13,11 +14,10 @@ import logging
 logging.captureWarnings(True)
 ###############################
 
+
 class SeafileUploader():
     def __init__(self):
-        self.processor = DummyProcessor()
-        self.seaf_lib = None
-        self.seaf_path = "/"
+        self.set = SeafScreencloudSettings()
         self.libs = None
         self.uil = QUiLoader()
         self.loadSettings()
@@ -25,11 +25,16 @@ class SeafileUploader():
 
     def showSettingsUI(self, parentWidget):
         self.parentWidget = parentWidget
-        self.settingsDialog = self.uil.load(QFile(workingDir + "/settings.ui"), parentWidget)
-        self.settingsDialog.group_account.widget_loggedIn.loginButton.connect("clicked()", self.startAuthenticationProcess)
+        # self.set.processor.configure(parentWidget)
+        self.settingsDialog = self.uil.load(
+            QFile(workingDir + "/settings.ui"), parentWidget)
+        self.settingsDialog.group_account.widget_loggedIn.loginButton.connect(
+            "clicked()", self.startAuthenticationProcess)
         #self.settingsDialog.group_name.input_name.connect("textChanged(QString)", self.nameFormatEdited)
-        self.settingsDialog.group_location.widget_location.pathEdit.connect("textChanged(QString)", self.locationUpdate)
-        self.settingsDialog.group_location.widget_location.libraryEditDrop.connect("currentIndexChanged(QString)", self.locationUpdate)
+        self.settingsDialog.group_location.widget_location.pathEdit.connect(
+            "textChanged(QString)", self.locationUpdate)
+        self.settingsDialog.group_location.widget_location.libraryEditDrop.connect(
+            "currentIndexChanged(QString)", self.locationUpdate)
         self.settingsDialog.connect("accepted()", self.saveSettings)
 
         self.loadSettings()
@@ -41,29 +46,35 @@ class SeafileUploader():
         drop.clear()
         drop.setEnabled(False)
         select = 0
-        if self.seaf_client:
-            self.libs = (self.seaf_client or self.seaf_lib.client).libraries()
+        if self.set.client() and self.set.client().ping():
+            self.libs = self.set.client().libraries()
             i = 0
             for lib in self.libs:
-                if self.seaf_lib is not None and lib.id == self.seaf_lib.id:
+                if self.set.library is not None and (lib.id == self.set.library.id or lib.name == self.set.library.name):
                     select = i
-                    print "set %s" % lib.name
+                    print("set %s" % lib.name)
                 drop.addItem(lib.name)
                 i = i+1
         drop.setCurrentIndex(select)
         drop.setEnabled(True)
 
     def updateUi(self):
-        self.settingsDialog.group_account.widget_loggedIn.usernameEdit.setText(self.access_token.username if not (self.access_token is None)  else "")
-        self.settingsDialog.group_account.widget_loggedIn.serverUrlEdit.setText(self.seaf_url or "https://seaf.shimun.net")
-        self.settingsDialog.group_account.widget_loggedIn.loginButton.setText("Logout" if self.access_token is not None else "Login")
+        self.settingsDialog.group_account.widget_loggedIn.usernameEdit.setText(
+            self.set.token.username if not (self.set.token is None) else "")
+        self.settingsDialog.group_account.widget_loggedIn.serverUrlEdit.setText(
+            self.set.url or "https://seaf.shimun.net")
+        self.settingsDialog.group_account.widget_loggedIn.loginButton.setText(
+            "Logout" if self.set.token is not None else "Login")
         #
-        if self.access_token is None and len(self.settingsDialog.group_account.widget_loggedIn.passwordEdit.text) > 0:
-            self.settingsDialog.group_account.widget_loggedIn.passwordEdit.setText("X" * 8)
+        if self.set.token is None and len(self.settingsDialog.group_account.widget_loggedIn.passwordEdit.text) > 0:
+            self.settingsDialog.group_account.widget_loggedIn.passwordEdit.setText(
+                "X" * 8)
         for elm in [self.settingsDialog.group_account.widget_loggedIn.usernameEdit, self.settingsDialog.group_account.widget_loggedIn.serverUrlEdit, self.settingsDialog.group_account.widget_loggedIn.passwordEdit]:
-            elm.setEnabled(self.access_token is None)
-        self.settingsDialog.group_location.setEnabled(self.access_token is not None)
-        self.settingsDialog.group_location.widget_location.pathEdit.setText(self.lib_path or "/")
+            elm.setEnabled(self.set.token is None)
+        self.settingsDialog.group_location.setEnabled(
+            self.set.token is not None)
+        self.settingsDialog.group_location.widget_location.pathEdit.setText(
+            self.set.library_path or "/")
         self.settingsDialog.linkCopyCheck.setChecked(self.copyLink)
         self.populateLibrarySelector()
         self.settingsDialog.adjustSize()
@@ -72,52 +83,30 @@ class SeafileUploader():
         settings = QSettings()
         settings.beginGroup("uploaders")
         settings.beginGroup("seafile")
-        self.seaf_url = settings.value("seafile-url", "")
-        (self.lib_id,self.lib_name) = str(settings.value("library", "/")).split("/")
-        self.lib_path = settings.value("library-path", "")
+        self.set.load(settings)
         self.copyLink = settings.value("copy-link", "true") in ['true', True]
-        if settings.value("auth-token", False) and settings.value("auth-username", False):
-            self.access_token = SeafileToken(settings.value("auth-username", False),settings.value("auth-token", False))
-        else:
-            self.access_token = None
-        self.nameFormat = settings.value("name-format", "Screenshot %Y-%m-%d %H_%M_%S")
+        self.nameFormat = settings.value(
+            "name-format", "Screenshot %Y-%m-%d %H_%M_%S")
         self.upload_scheme = settings.value("upload-scheme", "regular")
         settings.endGroup()
         settings.endGroup()
-        if self.seaf_url and self.access_token:
-            self.seaf_client = SeafileClient(self.seaf_url,self.access_token.username,token=self.access_token)
-            for lib in self.seaf_client.libraries():
-                if lib.id == self.lib_id:
-                    self.seaf_lib = lib
-            if self.seaf_lib and self.seaf_path:
-                self.processor = EncryptedProcessor(self.seaf_lib,self.lib_path)#DefaultProcessor(self.seaf_lib,self.lib_path)
-            
 
     def saveSettings(self):
         settings = QSettings()
         settings.beginGroup("uploaders")
         settings.beginGroup("seafile")
+        self.set.save(settings)
         try:
             self.copyLink = self.settingsDialog.linkCopyCheck.checked
         except:
             pass
         settings.setValue("copy-link", self.copyLink)
-        if self.access_token is not None:
-            settings.setValue("auth-username", self.access_token.username )
-            settings.setValue("auth-token", self.access_token.token)
-        settings.setValue("seafile-url", self.seaf_url)
-        if self.seaf_lib is not None:
-            settings.setValue("library", "%s/%s" % (self.seaf_lib.id,self.seaf_lib.name))
-        settings.setValue("library-path", self.lib_path)
         settings.setValue("name-format", self.nameFormat)
-        settings.setValue("upload-scheme", self.upload_scheme)
-        #settings.setValue("name-format", self.settingsDialog.group_name.input_name.text)
-        print self.seaf_lib, self.lib_path
         settings.endGroup()
         settings.endGroup()
 
     def isConfigured(self):
-        return self.access_token and self.seaf_url and self.processor.is_configured()
+        return self.set.library and self.set.processor.is_configured()
 
     def getFilename(self):
         self.loadSettings()
@@ -126,11 +115,12 @@ class SeafileUploader():
     def upload(self, screenshot, name):
         self.loadSettings()
         # Make sure we have a up to date token
-        if not self.seaf_lib:
+        if not self.set.library:
             ScreenCloud.setError("Not configured properly")
             return False
             # Save to a temporary file
         timestamp = time.time()
+
         def tempfile(name):
             try:
                 return QDesktopServices.storageLocation(QDesktopServices.TempLocation) + "/" + name
@@ -142,31 +132,33 @@ class SeafileUploader():
         screenshot.save(QFile(tmpFilename), ScreenCloud.getScreenshotFormat())
         # Upload!
         link = None
-        if True:
-        #try:
-            link = self.processor.upload(tmpFilename,self.getFilename())
+        # if True:
+        try:
+            link = self.set.processor.upload(tmpFilename, self.getFilename())
             if self.copyLink:
                 ScreenCloud.setUrl(link)
-        #except Exception as e:
-           # ScreenCloud.setError("Failed to upload to seafile. " + e.message)
-           # return False
+        except Exception as e:
+            ScreenCloud.setError("Failed to upload to seafile. Using: %s\n\n%s" % (
+                self.set.processor.name(), e.message))
+            return False
         return True
 
     def startAuthenticationProcess(self):
         self.saveSettings()
         self.loadSettings()
 
-        if self.access_token is not None:
+        if self.set.token is not None:
             self.logOut()
             return
 
         if self.settingsDialog.group_account.widget_loggedIn.serverUrlEdit.text \
                 and self.settingsDialog.group_account.widget_loggedIn.usernameEdit.text \
                 and self.settingsDialog.group_account.widget_loggedIn.passwordEdit.text:
-            self.seaf_url = self.settingsDialog.group_account.widget_loggedIn.serverUrlEdit.text
+            self.set.url = self.settingsDialog.group_account.widget_loggedIn.serverUrlEdit.text
             if True:
                 # try:
-                self.login(self.settingsDialog.group_account.widget_loggedIn.usernameEdit.text,self.settingsDialog.group_account.widget_loggedIn.passwordEdit.text)
+                self.login(self.settingsDialog.group_account.widget_loggedIn.usernameEdit.text,
+                           self.settingsDialog.group_account.widget_loggedIn.passwordEdit.text)
                 self.saveSettings()
                 self.loadSettings()
                 self.populateLibrarySelector()
@@ -178,31 +170,32 @@ class SeafileUploader():
     def locationUpdate(self):
         drop = self.settingsDialog.group_location.widget_location.libraryEditDrop
         selected_lib = drop.currentText
-        if not drop.isEnabled(): return #not populated
-        self.lib_path = self.settingsDialog.group_location.widget_location.pathEdit.text
-        print self.lib_path, selected_lib
-        if self.libs is None: return
+        if not drop.isEnabled():
+            return  # not populated
+        self.set.library_path = self.settingsDialog.group_location.widget_location.pathEdit.text
+        print(self.set.library_path, selected_lib)
+        if self.libs is None:
+            return
         for lib in self.libs:
             if lib.name == selected_lib:
-                self.seaf_lib = lib
-                print "%s user selected" % selected_lib
-
+                self.set.library = lib
+                print("%s user selected" % selected_lib)
 
     def login(self, user, password):
-        cli = SeafileClient(self.seaf_url,user,password)
-        self.access_token = cli.obtain_token()
+        cli = SeafileClient(self.set.url, user, password)
+        self.set.token = cli.obtain_token()
 
     def logOut(self):
         settings = QSettings()
         settings.beginGroup("uploaders")
         settings.beginGroup("seafile")
         settings.remove("auth-token")
-        self.access_token = None
+        self.set.token = None
         settings.endGroup()
         settings.endGroup()
         self.loadSettings()
         self.updateUi()
 
     def nameFormatEdited(self, nameFormat):
-        self.settingsDialog.group_name.label_example.setText(ScreenCloud.formatFilename(nameFormat, False))
-
+        self.settingsDialog.group_name.label_example.setText(
+            ScreenCloud.formatFilename(nameFormat, False))

make-modules.sh

@@ -1,8 +1,4 @@
-set -e
-
-rm -rf modules
-mkdir modules
-pip install --install-option="--prefix=$PWD" -r requirements.txt
-mv lib/python2.7/site-packages/* modules/
+mkdir -p modules
+pip3 install --install-option="--prefix=$PWD" -r requirements.txt "$@"
+mv lib/python3.*/site-packages/* modules/
 cp imports/* -r modules/
-

requirements.txt

@@ -1,5 +1,6 @@
 asn1crypto==0.24.0
 pycrypto
-scrypt
+#scrypt
 bson==0.5.6
 salsa20
+requests