Skip to content

Commit

Permalink
support for cloud version
Browse files Browse the repository at this point in the history
  • Loading branch information
@schorschii
schorschii committed Mar 31, 2020
1 parent b5f362b commit 4767619
Showing 1 changed file with 218 additions and 30 deletions.
248 changes: 218 additions & 30 deletions companion.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,12 @@
import os
import hashlib
import wx
import base64

DOWNLOAD_DIR = str(pathlib.Path.home()) + "/.cache/companion/tmp" # temp dir for downloading files
CONFIG_DIR = str(pathlib.Path.home()) + "/.config/companion" # config/settings dir
ALLOWED_FILE = CONFIG_DIR + "/" + "allowed" # file for allowed sites
CLOUD_HOST = "api.media.atlassian.com" # confluence cloud upload url

FILES = [] # temp storage for downloaded file metadata
ALLOWED_SITES = [] # stores allowed site names
Expand All @@ -40,6 +42,7 @@
# load config
if os.path.isfile(ALLOWED_FILE):
ALLOWED_SITES = pickle.load( open(ALLOWED_FILE, "rb") )
print("-> Loaded allowed sites:")
print(ALLOWED_SITES)

def askAllowSite(sitename):
Expand All @@ -61,26 +64,40 @@ async def handleJson(websocket, requestjson):
global ALLOWED_SITES
responsejson = {}
if(requestjson["type"] == "authentication"):
currentSiteTitle = requestjson["payload"]["payload"]["siteTitle"]
if(currentSiteTitle in ALLOWED_SITES or askAllowSite(currentSiteTitle)):
print("ACCEPTED SITE: " + requestjson["payload"]["payload"]["siteTitle"])
provider = requestjson["payload"]["provider"]

# on-prem (self-hosted)
if(provider == "server"):
currentSiteTitle = requestjson["payload"]["payload"]["siteTitle"]
if(currentSiteTitle in ALLOWED_SITES or askAllowSite(currentSiteTitle)):
print("-> ACCEPTED SITE: " + requestjson["payload"]["payload"]["siteTitle"])
responsejson = {
"requestID": requestjson["requestID"],
"type": "authentication-status",
"payload": "ACCEPTED"
}
else:
print("-> REJECTED SITE: " + requestjson["payload"]["payload"]["siteTitle"])
responsejson = {
"requestID": requestjson["requestID"],
"type": "authentication-status",
"payload": "REJECTED"
}
await send(websocket, json.dumps(responsejson))

# cloud hosted
elif(provider == "jwt"):
print("-> ACCEPTED JWT: " + requestjson["payload"]["payload"])
responsejson = {
"requestID": requestjson["requestID"],
"type": "authentication-status",
"payload": "ACCEPTED"
}
else:
print("REJECTED SITE: " + requestjson["payload"]["payload"]["siteTitle"])
responsejson = {
"requestID": requestjson["requestID"],
"type": "authentication-status",
"payload": "REJECTED"
}
await send(websocket, json.dumps(responsejson))
await send(websocket, json.dumps(responsejson))

elif(requestjson["type"] == "new-transaction" and requestjson["payload"]["transactionType"] == "file"):
newUuid = str(uuid.uuid4())
print("new uuid: "+newUuid)
print("-> Start new transaction with uuid: "+newUuid)
responsejson = {
"requestID": requestjson["requestID"],
"payload": newUuid
Expand Down Expand Up @@ -119,7 +136,7 @@ async def handleJson(websocket, requestjson):
urllib.request.urlretrieve(fileUrl, filePath)

# store file info for further requests (upload)
FILES.append({"transId":transId, "fileName":fileName})
FILES.append({"transId":transId, "fileName":fileName, "fileUrl":fileUrl})

# inform confluence that the download finished
responsejson = {
Expand All @@ -135,18 +152,20 @@ async def handleJson(websocket, requestjson):
wm.add_watch(DOWNLOAD_DIR, pyinotify.IN_MODIFY | pyinotify.IN_CLOSE_WRITE)
notifier = pyinotify.ThreadedNotifier(wm,
FileChangedHandler( dict={
"websocket":websocket,
"appId":appId,
"transId":transId,
"filePath":filePath,
"fileMd5":md5(filePath)
"websocket": websocket,
"appId": appId,
"transId": transId,
"fileUrl": fileUrl,
"filePath": filePath,
"fileMd5": md5(filePath)
})
)
notifier.start()

# start application
subprocess.call(["xdg-open", filePath])

# upload handler for self-hosted instances
elif(requestjson["type"] == "upload-file-in-app"):
transId = requestjson["transactionID"]
fileUrl = requestjson["payload"]["uploadUrl"]
Expand All @@ -172,7 +191,7 @@ async def handleJson(websocket, requestjson):
await send(websocket, json.dumps(responsejson))

# now upload the modified file
print("Now uploading " + fileName + " to: " + fileUrl)
print("-> Now uploading " + fileName + " to: " + fileUrl)
parsed_uri = urlparse(fileUrl)
host = '{uri.netloc}'.format(uri=parsed_uri)
origin = '{uri.scheme}://{uri.netloc}'.format(uri=parsed_uri)
Expand Down Expand Up @@ -220,11 +239,152 @@ async def handleJson(websocket, requestjson):
}
await send(websocket, json.dumps(responsejson))

# upload handler for cloud-hosted instances
elif(requestjson["type"] == "request-upload-token"):
# yummy, we got an upload token!
transId = requestjson["transactionID"]
uploadToken = requestjson["payload"]

# extract client id from jwt
clientId = json.loads(base64ToString(uploadToken.split(".")[1]))["iss"]

# get stored file name
fileName = None
for f in FILES:
if(f["transId"] == transId):
fileName = f["fileName"]
break
filePath = DOWNLOAD_DIR + "/" + fileName

# inform confluence that upload started
responsejson = {
"eventName": "file-upload-start",
"type": "event",
"payload": None,
"transactionID": transId
}
await send(websocket, json.dumps(responsejson))

# begin upload prodecure
print("-> Now uploading " + fileName + " to: " + CLOUD_HOST)

# step 1: create upload
headers = {
"Host": CLOUD_HOST,
"Authorization": "Bearer " + uploadToken,
"Connection": "close",
"Content-Length": "0",
"X-Client-Id": clientId
}
request = requests.post(
"https://"+CLOUD_HOST+"/upload?createUpTo=1",
headers=headers#, verify=False
)
resultData = json.loads(request.text)
uploadId = resultData["data"][0]["id"]
print(request)
print(request.text)

# step 2: transfer as a single chunk (split into multiple chunks not supported yet)
chunkId = sha1(filePath)
fileLength = os.path.getsize(filePath)
headers = {
"Host": CLOUD_HOST,
"Authorization": "Bearer " + uploadToken,
"Connection": "close",
"X-Client-Id": clientId,
#"Transfer-Encoding": "chunked",
"User-Agent": None, # override python requests defaults
"Accept-Encoding": None
}
with open(filePath, 'rb') as f:
request = requests.put(
"https://"+CLOUD_HOST+"/chunk/"+chunkId+"-"+str(fileLength),
data=f, headers=headers#, verify=False
)
print(request)
print(request.text)

# step 3: tell confluence which chunks belong to this upload
headers = {
"Host": CLOUD_HOST,
"Authorization": "Bearer " + uploadToken,
"Connection": "close",
"X-Client-Id": clientId,
"Content-Type": "application/json",
"User-Agent": None, # override python requests defaults
"Accept-Encoding": None
}
jsonData = {
"chunks": [chunkId+"-"+str(fileLength)]
}
request = requests.put(
"https://"+CLOUD_HOST+"/upload/"+uploadId+"/chunks",
headers=headers, data=json.dumps(jsonData)#, verify=False
)
print(request)
print(request.text)

# step 4: finish upload and get attachment id
headers = {
"Host": CLOUD_HOST,
"Authorization": "Bearer " + uploadToken,
"Connection": "close",
"X-Client-Id": clientId,
"Content-Type": "application/json",
"User-Agent": None, # override python requests defaults
"Accept-Encoding": None
}
jsonData = {
"uploadId": uploadId,
"name": fileName
}
request = requests.post(
"https://"+CLOUD_HOST+"/file/upload",
headers=headers, data=json.dumps(jsonData)#, verify=False
)
attachmentId = json.loads(request.text)["data"]["id"]
print(request)
print(request.text)

# inform confluence that upload finished
responsejson = {
"eventName": "file-upload-progress",
"type": "event",
"payload": {
"percentage": 100,
"length": fileLength/1024,
"transferred": fileLength/1024
},
"transactionID": transId
}
await send(websocket, json.dumps(responsejson))

# inform confluence that upload finished and tell new attachment id
responsejson = {
"eventName": "file-uploaded",
"type": "event",
"payload": {
"mediaType": "unknown",
"mimeType": "binary/octet-stream",
"name": fileName,
"size": fileLength/1024,
"processingStatus": "pending",
"artifacts": {}, #?
"representations": {}, #?
"createdAt": currentMilliTime(),
"id": attachmentId
},
"transactionID": transId
}
await send(websocket, json.dumps(responsejson))

class FileChangedHandler(pyinotify.ProcessEvent):
def my_init(self, dict):
self._websocket = dict["websocket"]
self._appId = dict["appId"]
self._transId = dict["transId"]
self._fileUrl = dict["fileUrl"]
self._filePath = os.path.abspath(dict["filePath"])
self._fileMd5 = dict["fileMd5"]

Expand All @@ -239,13 +399,14 @@ def process_IN_CLOSE_WRITE(self, event):
# (LibreOffice modifies the file directly.)
def process_IN_MODIFY(self, event):
if(self._filePath == event.pathname):
print("matching file event: " + event.pathname)
print("-> matching file event: " + event.pathname)
newFileMd5 = md5(event.pathname)
if(self._fileMd5 == newFileMd5):
print("-> file content not changed, ingnoring")
print("--> file content not changed, ignoring")
else:
print("-> file content changed, inform confluence")
print("--> file content changed, inform confluence")
self._fileMd5 = newFileMd5

# inform confluence about the changes
responsejson = {
"eventName": "file-change-detected",
Expand All @@ -254,9 +415,22 @@ def process_IN_MODIFY(self, event):
"transactionID": self._transId
}
self._loop = asyncio.new_event_loop()
task = self._loop.create_task(self._websocket.send(json.dumps(responsejson)))
task = self._loop.create_task(send(self._websocket, json.dumps(responsejson)))
self._loop.run_until_complete(task)
print("> " + json.dumps(responsejson))

# initiate direct upload - only for cloud hosted instances
parsedUri = urlparse(self._fileUrl)
if('{uri.netloc}'.format(uri=parsedUri) == CLOUD_HOST):
responsejson = {
"eventName": "request-upload-token",
"responseID": 1,
"type": "event",
"payload": None,
"transactionID": self._transId
}
self._loop = asyncio.new_event_loop()
task = self._loop.create_task(send(self._websocket, json.dumps(responsejson)))
self._loop.run_until_complete(task)

async def companionHandler(websocket, path):
while(True):
Expand All @@ -268,18 +442,32 @@ async def send(websocket, response):
await websocket.send(response)
print(f"> {response}")

def currentMilliTime():
return int(round(time.time() * 1000));

def stringToBase64(s):
return base64.b64encode(s.encode('utf-8'))

def base64ToString(b):
b += "=" * ((4 - len(b) % 4) % 4)
return base64.b64decode(b).decode('utf-8')

def md5(fname):
hash_md5 = hashlib.md5()
hash = hashlib.md5()
with open(fname, "rb") as f:
for chunk in iter(lambda: f.read(4096), b""):
hash_md5.update(chunk)
return hash_md5.hexdigest()
hash.update(chunk)
return hash.hexdigest()

#ssl_context = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER)
#ssl_context.load_cert_chain('demo-cert/companion.crt', 'demo-cert/companion.key')
def sha1(fname):
hash = hashlib.sha1()
with open(fname, "rb") as f:
for chunk in iter(lambda: f.read(4096), b""):
hash.update(chunk)
return hash.hexdigest()

start_server = websockets.serve(
companionHandler, "localhost", 31459#, ssl=ssl_context
companionHandler, "localhost", 31459
)

asyncio.get_event_loop().run_until_complete(start_server)
Expand Down

0 comments on commit 4767619

Please sign in to comment.