.drone.yml

@@ -1,17 +1,9 @@
 pipeline:
  modules:
-  image: python:3.5
+  image: python:3.6
   commands:
     - ./make-modules.sh
  package:
   image: kramos/alpine-zip
   commands:
     - zip seafile.zip -r modules icon.png main.py metadata.xml settings.ui
- upload_package:
-    image: vividboarder/drone-webdav
-    file: seafile.zip
-    destination: https://git.shimun.net/files/screencloud-seafile/$$TAG.zip
-    username: git
-    secrets: [webdav_password]
-    when:
-      event: tag

imports/encryptedscreenshot.py

@@ -1,20 +1,21 @@
-import bson#, scrypt
+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, binascii
+import os, struct, time, hashlib, hashlib, random
 
 
 class EncryptedScreenshot:
-    def __init__(self, metadata,password=None,id=None,signer=None,password_encryptor=None):
+    def __init__(self, metadata,id=None,signer=None,password_encryptor=None):
         def rand(len):
             return ''.join(
                 random.choice("1234567890ABCDEFGHIJKLMNOPQRSTUWVXYZabcdefghijklmnopqrstuwvxyz") for _ in range(len))
 
-        self.password = (password or rand(16))
+        self.password = rand(16)
+        print("Passphrase %s" % str(bytearray(self.passphrase())).encode("hex"))
         self.id = id
         if id is None:
             self.id = rand(8)
@@ -33,7 +34,7 @@ class EncryptedScreenshot:
         # new ScryptParameters(64, 8, 1,32, new Uint8List.fromList(new List<int>()))
         print("Password units: %s" % (map(ord, self.password.encode("utf-8")),))
         sha = hashlib.sha256()
-        sha.update(self.password.encode("utf-8"))
+        sha.update(self.password)
         return sha.digest()  # scrypt.hash(self.password.encode("utf-8"), '', 64, 8, 1, 32)
 
     def assemble(self, file):
@@ -41,26 +42,25 @@ class EncryptedScreenshot:
         self.metadata["hash"] = image_digest
         unencrypted_metadata = bson.dumps(self.metadata)
         if len(unencrypted_metadata) % 16 != 0:
-            unencrypted_metadata += b' ' * (16 - len(unencrypted_metadata) % 16)
+            unencrypted_metadata += ' ' * (16 - len(unencrypted_metadata) % 16)
         (encryptor, iv) = self.encryptor(len(unencrypted_metadata))
-        encrypted_metadata = b''
+        encrypted_metadata = []
 
         encrypted_metadata += encryptor(unencrypted_metadata)
 
-        encrypted_metadata = iv + encrypted_metadata
+        encrypted_metadata = iv + str(bytearray(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,
-            "public_metadata": self.metadata["public"]
+            "metadata": encrypted_metadata if self.metadata_encryption else self.metadata
         }
 
         if self.signer is not None:
@@ -73,9 +73,8 @@ class EncryptedScreenshot:
 
     def encryptor(self,length=0):
         iv = os.urandom(16)
-        nonce = int(binascii.hexlify(iv), 16)
-        ctr = Counter.new(128,initial_value = nonce)# initial_value = nonce)
-        print("IV: %s" % binascii.hexlify(iv))
+        ctr = Counter.new(128, initial_value=long(iv.encode("hex"), 16))
+        print("IV: %s" % iv.encode("hex"))
         cipher = AES.new(self.passphrase(), AES.MODE_CTR, counter=ctr)
 
         #salsa
@@ -95,7 +94,7 @@ class EncryptedScreenshot:
     def encrypt(self, file):
         filesize = os.path.getsize(file)
         (encryptor, iv) = self.encryptor(filesize)
-        binary = b''
+        binary = []
         digest = hashlib.sha256()
         with open(file, 'rb') as infile:
             # binary += struct.pack('<Q', filesize)
@@ -107,7 +106,7 @@ class EncryptedScreenshot:
                     pass  # chunk += ' ' * (16 - len(chunk) % 16)
                 digest.update(chunk)
                 binary += encryptor(chunk)
-        return (digest.digest(), iv + binary)
+        return (digest.digest(), iv + str(bytearray(binary)))
 
 from Crypto.Signature import PKCS1_v1_5
 from Crypto.Hash import SHA256
@@ -131,8 +130,8 @@ class Signer:
     def signature(self,data):
         signed = self.sign(data)
         return {"signed-hash": signed,
-                "signature-algorithm": "SHA-256/%s" % ("RSA" if self.mode == RSA else "DSA"),
-                "key-id": (self.privateKeyId)
+                "signature-algorithm": "SHA-256/%s" % unicode("RSA" if self.mode == RSA else "DSA"),
+                "key-id": unicode(self.privateKeyId)
                 }
 
 

imports/hashderive.py

@@ -1,30 +0,0 @@
-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()
-        hex = lambda b: 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,8 +1,7 @@
 import time
 
 from encryptedscreenshot import EncryptedScreenshot, Signer
-from hashderive import HashDerivedKey
-import getpass, os, sys
+import getpass, os
 from PythonQt.QtGui import QInputDialog
 from PythonQt.QtCore import QSettings
 from seafapi import *
@@ -37,17 +36,14 @@ class EncryptedProcessor(Processor):
     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", None)
-        if settings.value("encscreen-derived-key", None):
-            self.derived_key = HashDerivedKey.from_hex(settings.value("encscreen-derived-key", None))
+        self.host = settings.value("encscreen-url", "")
         settings.endGroup()
         settings.endGroup()
 
@@ -56,7 +52,6 @@ class EncryptedProcessor(Processor):
         settings.beginGroup("uploaders")
         settings.beginGroup("seafile")
         settings.setValue("encscreen-url", self.host)
-        if self.derived_key: settings.setValue(self.derived_key.master_hex())
         settings.endGroup()
         settings.endGroup()
 
@@ -64,28 +59,17 @@ 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=(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.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.save_settings()
 
     def upload(self,file,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,
+        enrypted = EncryptedScreenshot({
+            "owner": unicode(getpass.getuser()),
+            "format": unicode(str(file).split('.')[-1]),
+            "title": unicode(name),
             "timestamp": int(time.time() * 1000),
-            "size": os.stat(file).st_size,
-            "public": key_meta
-        },password=key,signer=Signer.default())
+            "size": os.stat(file).st_size
+        },signer=Signer.default())
         tmpHandle = open(file + "c", 'wb')
         tmpHandle.write(enrypted.assemble(file))
         tmpHandle.close()

imports/seafapi.py

@@ -6,17 +6,14 @@ 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,auth=False):
+    def ping(self):
         try:
-            return self.session.get("%s%s/ping" % (self.api_endpoint(),"/auth" if auth else "")).text == "\"pong\""
+            return requests.get("%s/ping" % self.api_endpoint()).text == "pong"
         except:
             return False
 
@@ -35,13 +32,11 @@ 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=self.session.get("%s/repos/" % self.api_endpoint(), headers = {'Authorization': "Token %s" % self.token.token, 'Accept': 'application/json; indent=4' })
+        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
         libraries=[]
         for lib in resp.json():
@@ -53,7 +48,6 @@ 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
@@ -65,11 +59,11 @@ 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 = self.session.get("%s/upload-link" % self.api_endpoint(), headers = {'Authorization': "Token %s" % self.client.token.token,}).text
+            quoted = requests.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 = self.session.post(link or obtain_link() ,
+        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,}
                       )
@@ -79,7 +73,7 @@ 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=self.session.get("%s/file/detail/?p=%s" % (self.api_endpoint(),path), headers = {'Authorization': "Token %s" % self.token.token, 'Accept': 'application/json; indent=4' })
+        resp=requests.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'])
@@ -94,26 +88,20 @@ class SeafileFile:
         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,expire=None,password=None):
-        parameters = {'p': self.path }
-        if expiry:
-          parameters['expire'] = int(expire)
-        if password:
-          parameters['password'] = str(password)
-        resp = self.session.put("%s/repos/%s/file/shared-link/" % (self.library.client.api_endpoint(),self.library.id),
+    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'},
-                            data = parameters
+                            data = {'p': self.path}
                             )
         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 = self.session.get("%s/update-link" % self.library.api_endpoint(), headers = {'Authorization': "Token %s" % self.library.client.token.token,}).text
+            quoted = requests.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())

main.py

@@ -22,12 +22,9 @@ class SeafileUploader():
         self.uil = QUiLoader()
         self.loadSettings()
         self.pool = Pool(2)
-        self.seaf_client = None
-        self.link_expiry = None
         
     def showSettingsUI(self, parentWidget):
         self.parentWidget = parentWidget
-        #self.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)
@@ -44,13 +41,13 @@ class SeafileUploader():
         drop.clear()
         drop.setEnabled(False)
         select = 0
-        if self.seaf_client and self.seaf_client.ping():
+        if self.seaf_client:
             self.libs = (self.seaf_client or self.seaf_lib.client).libraries()
             i=0
             for lib in self.libs:
                 if self.seaf_lib is not None and lib.id == self.seaf_lib.id:
                     select = i
-                    print("set %s" % lib.name)
+                    print "set %s" % lib.name
                 drop.addItem(lib.name)
                 i=i+1
         drop.setCurrentIndex(select)
@@ -79,7 +76,6 @@ class SeafileUploader():
         (self.lib_id,self.lib_name) = str(settings.value("library", "/")).split("/")
         self.lib_path = settings.value("library-path", "")
         self.copyLink = settings.value("copy-link", "true") in ['true', True]
-        self.link_expiry = settings.value("link-expiry", None)
         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:
@@ -90,12 +86,11 @@ class SeafileUploader():
         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)
-            if self.seaf_client.ping():
-                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)
+            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):
@@ -107,8 +102,6 @@ class SeafileUploader():
         except:
             pass
         settings.setValue("copy-link", self.copyLink)
-        if self.link_expiry:
-          settings.setValue("link-expiry", self.link_expiry)
         if self.access_token is not None:
             settings.setValue("auth-username", self.access_token.username )
             settings.setValue("auth-token", self.access_token.token)
@@ -119,7 +112,7 @@ class SeafileUploader():
         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)
+        print self.seaf_lib, self.lib_path
         settings.endGroup()
         settings.endGroup()
     
@@ -187,12 +180,12 @@ class SeafileUploader():
         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)
+        print self.lib_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)
+                print "%s user selected" % selected_lib
 
 
     def login(self,user,password):

make-modules.sh

@@ -1,5 +1,6 @@
 rm -rf modules
 mkdir modules
 pip3 install --install-option="--prefix=$PWD" -r requirements.txt
-mv lib/python3.5/site-packages/* modules/
+mv lib/python3.6/site-packages/* modules/
 cp imports/* -r modules/
+

requirements.txt

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