Update webhook and setup #1
|
@ -1,18 +1,14 @@
|
||||||
|
"""Transifex webhook handler """
|
||||||
import sys
|
|
||||||
|
|
||||||
import os
|
import os
|
||||||
|
|||||||
import base64
|
import base64
|
||||||
|
|
||||||
import time
|
import time
|
||||||
import json
|
import json
|
||||||
import re
|
|
||||||
import hmac
|
import hmac
|
||||||
import pprint
|
|
||||||
import hashlib
|
import hashlib
|
||||||
import requests
|
|
||||||
from subprocess import call
|
from subprocess import call
|
||||||
from base64 import b64encode
|
from base64 import b64encode
|
||||||
PeterSurda
commented
no need no need `logging`
PeterSurda
commented
no need for no need for `logging`
|
|||||||
|
import requests
|
||||||
|
|
||||||
from buildbot.process.properties import Properties
|
from buildbot.process.properties import Properties
|
||||||
PeterSurda
commented
we already imported base64 we already imported base64
|
|||||||
from buildbot.util import bytes2unicode, unicode2bytes
|
from buildbot.util import bytes2unicode, unicode2bytes
|
||||||
|
@ -25,152 +21,94 @@ from dateutil.parser import parse as dateparse
|
||||||
|
|
||||||
_HEADER_USER_AGENT = 'User-Agent'
|
_HEADER_USER_AGENT = 'User-Agent'
|
||||||
_HEADER_SIGNATURE = 'X-TX-Signature'
|
_HEADER_SIGNATURE = 'X-TX-Signature'
|
||||||
|
_HEADER_URL_PATH = 'X-TX-Url'
|
||||||
|
HTTP_DATE = 'date'
|
||||||
_EVENT_KEY = 'event'
|
_EVENT_KEY = 'event'
|
||||||
PeterSurda
commented
why? why?
PeterSurda
commented
`_HEADER_DATE`
|
|||||||
transifexSecret = ""
|
transifex_request_data = {}
|
||||||
transifexUsername = ""
|
|
||||||
transifexPassword = ""
|
|
||||||
transifex_dict = {}
|
|
||||||
secret = ""
|
|
||||||
master = ""
|
|
||||||
|
|
||||||
PeterSurda
commented
This is specific to a request so it shouldn't be a module variable. Wrong scope. At the very least, if there are multiple requests in parallel, this will cause collisions. This is specific to a request so it shouldn't be a module variable. Wrong scope. At the very least, if there are multiple requests in parallel, this will cause collisions.
|
|||||||
gitHubToken = os.environ('gitHubToken')
|
|
||||||
|
|
||||||
PeterSurda
commented
should be inside the map should be inside the map
PeterSurda
commented
we don't need any of this we don't need any of this
|
|||||||
class TransifexHandler(BaseHookHandler):
|
class TransifexHandler(BaseHookHandler):
|
||||||
PeterSurda
commented
should be arguments passed to constructor should be arguments passed to constructor
|
|||||||
|
|
||||||
def __init__(self, master, secret, transifex_dict):
|
def __init__(self, master, secret, options, transifex_dict):
|
||||||
|
if not options:
|
||||||
PeterSurda
commented
should be extracted from properties or buildbot runtime variables should be extracted from properties or buildbot runtime variables
|
|||||||
|
options = {}
|
||||||
self.secret = secret
|
self.secret = secret
|
||||||
PeterSurda
commented
`options` should probably be the last and default to `None` or something
|
|||||||
self.master = master
|
self.master = master
|
||||||
PeterSurda marked this conversation as resolved
Outdated
|
|||||||
|
self.options = options
|
||||||
self.transifex_dict = transifex_dict
|
self.transifex_dict = transifex_dict
|
||||||
|
|
||||||
PeterSurda marked this conversation as resolved
Outdated
PeterSurda
commented
something like something like `transifex_to_github_map` is a better name
|
|||||||
|
|
||||||
def returnMessage(self, status = False, message = "Unimplemented"):
|
def returnMessage(self, status = False, message = "Unimplemented"):
|
||||||
output = json.dumps({"status": "OK" if status else "FAIL", "message": message})
|
output = json.dumps({"status": "OK" if status else "FAIL", "message": message})
|
||||||
return [output, [('Content-type', 'text/plain'),
|
return [output, [('Content-type', 'application/json')]]
|
||||||
('Content-Length', str(len(output)))
|
|
||||||
]]
|
|
||||||
|
|
||||||
def verifyTransifexSignature(
|
def verifyTransifexSignature(
|
||||||
PeterSurda marked this conversation as resolved
Outdated
PeterSurda
commented
`_verifyTransifexSignature`
|
|||||||
self, request, content, rendered_secret, signature, header_signature
|
self, request, content, signature, header_signature
|
||||||
):
|
):
|
||||||
http_verb = 'POST'
|
http_verb = 'POST'
|
||||||
http_url_path = request.headers('X-TX-Url')
|
http_url_path = request.getHeader(_HEADER_URL_PATH)
|
||||||
PeterSurda
commented
- content-length is usually set by the web server automatically
- content-type should maybe be `application/json`
|
|||||||
http_gmt_date = request.headers('Date')
|
http_gmt_date = request.getHeader(HTTP_DATE)
|
||||||
content_md5 = hashlib.md5(content).hexdigest()
|
content_md5 = hashlib.md5(content).hexdigest()
|
||||||
msg = b'\n'.join([
|
msg = b'\n'.join([
|
||||||
http_verb, http_url_path, http_gmt_date, content_md5
|
http_verb, http_url_path, http_gmt_date, content_md5
|
||||||
PeterSurda marked this conversation as resolved
Outdated
PeterSurda
commented
rendered_secret can be extracted directly, no need to pass it rendered_secret can be extracted directly, no need to pass it
|
|||||||
])
|
])
|
||||||
tx_signature = base64.b64encode(
|
tx_signature = base64.b64encode(
|
||||||
hmac.new(
|
hmac.new(
|
||||||
key=rendered_secret,
|
key=self.rendered_secret,
|
||||||
msg=msg,
|
msg=msg,
|
||||||
digestmod=hashlib.sha256
|
digestmod=hashlib.sha256
|
||||||
).digest()
|
).digest()
|
||||||
)
|
)
|
||||||
if tx_signature() != header_signature:
|
if tx_signature != header_signature:
|
||||||
raise ValueError('Invalid secret')
|
|
||||||
|
|
||||||
try:
|
|
||||||
if signature != os.environ.get('HTTP_X_TX_SIGNATURE'):
|
|
||||||
return False
|
|
||||||
return True
|
|
||||||
except:
|
|
||||||
return False
|
return False
|
||||||
|
|
||||||
def downloadTranslatedLanguage(self, ts, lang):
|
if signature != request.getHeader(_HEADER_SIGNATURE):
|
||||||
headers = {"Authorization": "Basic " + b64encode(transifexUsername + ":" + transifexPassword)}
|
return False
|
||||||
PeterSurda
commented
maybe just maybe just `raise ValueError("Signature mismatch")`, then it will propagate up
|
|||||||
fname = "bitmessage_" + lang.lower() + ".po"
|
|
||||||
with open("src/translations/" + fname, "wt") as handle:
|
|
||||||
response = requests.get("https://www.transifex.com/api/2/project/pybitmessage/resource/pybitmessage/translation/" + lang + "/",
|
|
||||||
headers=headers)
|
|
||||||
if response.ok:
|
|
||||||
content = json.loads(response.content)["content"]
|
|
||||||
handle.write(content.encode("utf-8"))
|
|
||||||
return response
|
|
||||||
|
|
||||||
def commitTranslatedLanguage(self, ts, lang):
|
|
||||||
call(["kivy", "src/translations/messages.pro"])
|
|
||||||
call(["git", "add", "src/translations/bitmessage_" + lang + ".ts", "src/translations/bitmessage_" + lang + ".qm"])
|
|
||||||
call(["git", "commit", "-q", "-S", "-m", "Auto-updated language %s from transifex" % (lang)])
|
|
||||||
newbranch = "translate_" + lang + "_" + str(ts)
|
|
||||||
call(["git", "push", "-q", "translations", newbranch + ":" + newbranch])
|
|
||||||
branch = transifex_dict['branch']
|
|
||||||
|
|
||||||
request = {
|
|
||||||
"title": "Translation update " + lang,
|
|
||||||
"body": "Auto-updated from transifex",
|
|
||||||
"head": "PyBitmessageTranslations:" + newbranch,
|
|
||||||
"base": branch
|
|
||||||
}
|
|
||||||
headers = {"Authorization": "token " + gitHubToken}
|
|
||||||
response = requests.post("https://api.github.com/repos/Bitmessage/PyBitmessage/pulls",
|
|
||||||
headers=headers, data=json.dumps(request))
|
|
||||||
return response
|
|
||||||
|
|
||||||
|
|
||||||
PeterSurda
commented
`return True` missing
|
|||||||
def process_translation_completed(self, payload, transifex_dict, event_type, codebase):
|
def process_translation_completed(self, payload, transifex_dict, event_type, codebase):
|
||||||
changes = []
|
changes = []
|
||||||
PeterSurda
commented
`tx_signature` isn't a function/method
|
|||||||
transifex_response = self._transform_variables(payload, transifex_dict)
|
transifex_response = self._transform_variables(payload, transifex_dict)
|
||||||
PeterSurda marked this conversation as resolved
Outdated
|
|||||||
if 'pybitmessage-test' in transifex_response['project'] and 'messagespot' in transifex_response['resource']:
|
if 'pybitmessage-test' in transifex_response['project'] and 'messagespot' in transifex_response['resource']:
|
||||||
PeterSurda
commented
don't have weird constants here, rather process is through the map. don't have weird constants here, rather process is through the map.
PeterSurda
commented
`repository` missing
|
|||||||
if 'translation_completed' in transifex_response['event'] and 100 in transifex_response['translated']:
|
if 'translation_completed' in transifex_response['event']:
|
||||||
PeterSurda
commented
`transifex_to_github_map` is an object attribute, no need to pass it around
|
|||||||
ts = int(time.time())
|
ts = int(time.time())
|
||||||
PeterSurda marked this conversation as resolved
Outdated
PeterSurda
commented
- use constant
- use a default value, then no need for try/except
|
|||||||
lang = transifex_response['language']
|
lang = transifex_response['language']
|
||||||
PeterSurda
commented
error handling missing here error handling missing here
|
|||||||
branch = transifex_dict['branch']
|
return
|
||||||
self.downloadTranslatedLanguage(ts, lang.lower())
|
|
||||||
response = self.commitTranslatedLanguage(ts, lang.lower())
|
|
||||||
if response.ok:
|
|
||||||
output, responseHeaders = self.returnMessage(True, "Processed.")
|
|
||||||
else:
|
|
||||||
output, responseHeaders = self.returnMessage(False, "Error: %i." % (response.status_code))
|
|
||||||
else:
|
|
||||||
output, responseHeaders = self.returnMessage(False, "Nothing to do")
|
|
||||||
else:
|
|
||||||
output, responseHeaders = self.returnMessage(False, "Nothing to do")
|
|
||||||
|
|
||||||
PeterSurda
commented
if you use if you use `.get` with a default value, you can avoid `try`/`except`
|
|||||||
# if isinstance(self.options, dict) and self.options.get('onlyIncludePushCommit', False):
|
# if isinstance(self.options, dict):
|
||||||
PeterSurda
commented
`language = payload.get('language', "None")`
|
|||||||
# commits = commits[:1]
|
# commits = commits[:1]
|
||||||
PeterSurda
commented
this should be the randomly generated one, the branch of the PR this should be the randomly generated one, the branch of the PR
|
|||||||
|
|
||||||
PeterSurda marked this conversation as resolved
Outdated
PeterSurda
commented
This should be in the buildbot job, not here. The webhook only transforms data structures and puts them into a database.
This should be in the buildbot job, not here. The webhook only transforms data structures and puts them into a database.
- `"tx pull -l language {}".format(options["language").` or something like that
PeterSurda
commented
this line ( this line (`'resource': ...`) should be remove
|
|||||||
# for commit in commits:
|
# # for commit in commits:
|
||||||
PeterSurda
commented
something like something like `translated_request` or `mapped_request` would be more understandable. There is not response coming from transifex.
|
|||||||
# files = []
|
# # files = []
|
||||||
PeterSurda
commented
not translating anything. There is nothing here that translates transifex payload information into github information. not translating anything. There is nothing here that translates transifex payload information into github information.
|
|||||||
# for kind in ('added', 'modified', 'removed'):
|
# # for kind in ('added', 'modified', 'removed'):
|
||||||
# files.extend(commit.get(kind, []) or [])
|
# # files.extend(commit.get(kind, []) or [])
|
||||||
# timestamp = dateparse(commit['timestamp'])
|
change = {
|
||||||
# change = {
|
'author': 'buildbot-transifex,
|
||||||
# 'author': '{} <{}>'.format(commit['author']['name'],
|
'resource': transifex_response['resource'],
|
||||||
PeterSurda
commented
this is a sub-property this is a sub-property
|
|||||||
# commit['author']['email']),
|
'branch': transifex_dict['branch'],
|
||||||
PeterSurda
commented
from map from map
|
|||||||
# 'files': files,
|
'project': transifex_response['project'],
|
||||||
PeterSurda
commented
- no need super
- needs `master`
- doesn't save `transifex_dict`
- `secret` also missing
PeterSurda
commented
from map from map
|
|||||||
# 'comments': commit['message'],
|
'event': event_type,
|
||||||
# 'revision': commit['id'],
|
'properties': {
|
||||||
# 'when_timestamp': timestamp,
|
'branch': branch,
|
||||||
# 'branch': branch,
|
'revision': revision,
|
||||||
# 'revlink': commit['url'],
|
'language': lang,
|
||||||
# 'repository': repo_url,
|
'resource': resource,
|
||||||
# 'project': project,
|
'project': project
|
||||||
# 'category': event_type,
|
}
|
||||||
PeterSurda
commented
maybe add error handling, e.g. maybe add error handling, e.g.
```raise ValueError("Unknown project %s from transifex".format(transifex_project)"```
|
|||||||
# 'properties': {
|
}
|
||||||
# 'event': event_type,
|
if codebase is not None:
|
||||||
PeterSurda
commented
missing functionality, the project should be extracted from the missing functionality, the project should be extracted from the `repository` variable
|
|||||||
# 'repository_name': repository['name'],
|
change['codebase'] = codebase
|
||||||
# 'owner': repository["owner"]["username"]
|
changes.insert(0, change)
|
||||||
# },
|
|
||||||
# }
|
|
||||||
# if codebase is not None:
|
|
||||||
# change['codebase'] = codebase
|
|
||||||
# changes.insert(0, change)
|
|
||||||
return changes
|
return changes
|
||||||
|
|
||||||
PeterSurda
commented
this shouldn't be here this shouldn't be here
|
|||||||
def process_review_completed(self, payload, transifex_data):
|
|
||||||
pass
|
|
||||||
|
|
||||||
|
|
||||||
def _transform_variables(self, payload, transifex_dict):
|
def _transform_variables(self, payload, transifex_dict):
|
||||||
transifex_variables = {
|
project = payload.get('project', 'None')
|
||||||
'project': payload['project'],
|
transform_values = {
|
||||||
"translated": payload['translated'],
|
project: {
|
||||||
"resource": payload['resource'],
|
"repository": "https://github.com/Bitmessage/PyBitmessage",
|
||||||
"event": payload['event'],
|
"branch": "v0.6"
|
||||||
PeterSurda
commented
- either don't verify user agent at all, or verify it inside verifyTransifexSignature
- the verification should be called before the factory pattern
|
|||||||
"language": payload['language']
|
}
|
||||||
}
|
}
|
||||||
|
return transform_values
|
||||||
return transifex_variables
|
|
||||||
|
|
||||||
@defer.inlineCallbacks
|
@defer.inlineCallbacks
|
||||||
def getChanges(self, request):
|
def getChanges(self, request):
|
||||||
|
@ -187,19 +125,39 @@ class TransifexHandler(BaseHookHandler):
|
||||||
if self.secret is not None:
|
if self.secret is not None:
|
||||||
p = Properties()
|
p = Properties()
|
||||||
PeterSurda
commented
duplicate duplicate
|
|||||||
p.master = self.master
|
p.master = self.master
|
||||||
rendered_secret = yield p.render(self.secret)
|
option = self.options
|
||||||
|
self.rendered_secret = yield p.render(self.secret)
|
||||||
PeterSurda
commented
since we're raising inside the since we're raising inside the `_verifyTransifexSignature`, no need for `if` here anymore
|
|||||||
signature = hmac.new(
|
signature = hmac.new(
|
||||||
unicode2bytes(rendered_secret),
|
unicode2bytes(self.rendered_secret),
|
||||||
PeterSurda
commented
this is incomplete, we shouldn't proceed if the verification fails this is incomplete, we shouldn't proceed if the verification fails
|
|||||||
unicode2bytes(content_text.strip()),
|
unicode2bytes(content_text.strip()),
|
||||||
PeterSurda
commented
we're not doing anything with the return value of the verification we're not doing anything with the return value of the verification
|
|||||||
digestmod=hashlib.sha256)
|
digestmod=hashlib.sha256)
|
||||||
header_signature = bytes2unicode(
|
header_signature = bytes2unicode(
|
||||||
request.getHeader(_HEADER_SIGNATURE))
|
request.getHeader(_HEADER_SIGNATURE))
|
||||||
self.verifyTransifexSignature(
|
self.verifyTransifexSignature(
|
||||||
request, content, rendered_secret,
|
request, content, self.rendered_secret,
|
||||||
PeterSurda
commented
duplicate duplicate
|
|||||||
signature, header_signature
|
signature, header_signature
|
||||||
)
|
)
|
||||||
|
|
||||||
event_type = bytes2unicode(payload.get(_EVENT_KEY), "None")
|
event_type = payload.get("event", "None")
|
||||||
|
language = payload.get("language", 'None')
|
||||||
PeterSurda
commented
we shouldn't be modifying we shouldn't be modifying `request_data`, that's input
|
|||||||
|
project = payload.get("project", 'None')
|
||||||
PeterSurda
commented
maybe maybe `mapped_request`
|
|||||||
|
resource = payload.get("resource", 'None')
|
||||||
|
|
||||||
|
transifex_request_data['branch'] = "v0.6"
|
||||||
PeterSurda
commented
from the map from the map
PeterSurda
commented
maybe make maybe make `"buildbot-transifex`" a class variable or a module variable?
|
|||||||
|
transifex_request_data['revision'] = ""
|
||||||
PeterSurda
commented
not doing anything useful not doing anything useful
|
|||||||
|
transifex_request_data["properties"] = "langugage"
|
||||||
PeterSurda
commented
this is github syntax, needs to be translated into transifex syntax, maybe even ignored as transifex may not have this kind of variable this is github syntax, needs to be translated into transifex syntax, maybe even ignored as transifex may not have this kind of variable
PeterSurda
commented
```
transifex_request_data["properties"] = {
"transifex_language": language,
"transifex_resource": resource,
"transifex_project": project
}
```
|
|||||||
|
transifex_request_data["properties"] = "resource"
|
||||||
|
transifex_request_data["properties"] = "project"
|
||||||
|
|
||||||
|
transifex_request_data["properties"] = {
|
||||||
|
"branch": branch,
|
||||||
|
"revision": revision
|
||||||
|
}
|
||||||
|
transifex_request_data["changes"] = {
|
||||||
|
"author": "buildbot-transifex",
|
||||||
|
"repository": project,
|
||||||
|
}
|
||||||
|
|
||||||
log.msg("Received event '{}' from transifex".format(event_type))
|
log.msg("Received event '{}' from transifex".format(event_type))
|
||||||
|
|
||||||
PeterSurda
commented
- here you need to translate from transifex syntax using the map to github syntax
- also add additional transifex variables as custom properties
|
|||||||
codebase = ""
|
codebase = ""
|
||||||
|
|
isort