From 0dd65c6af887c737fd87d0255a19d97e75361b40 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 26 Mar 2014 14:33:19 +0100 Subject: [ADD] deploy script bzr revid: fme@openerp.com-20140326133319-sp8lcvujq7uy55zd --- addons/base_import_module/bin/oe_module_deploy.py | 65 +++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100755 addons/base_import_module/bin/oe_module_deploy.py (limited to 'addons/base_import_module/bin') diff --git a/addons/base_import_module/bin/oe_module_deploy.py b/addons/base_import_module/bin/oe_module_deploy.py new file mode 100755 index 00000000000..d57f589901a --- /dev/null +++ b/addons/base_import_module/bin/oe_module_deploy.py @@ -0,0 +1,65 @@ +#!/usr/bin/env python +import argparse +import os +import sys +import tempfile +import urllib +import urllib2 +import zipfile + +def deploy_module(module_path, url, login, password, db=None): + if url.endswith('/'): + url = url[:-1] + module_file = zip_module(module_path) + cookie = authenticate(url, login, password, db) + upload_module(url, module_file, cookie) + +def upload_module(server, module_file, cookie): + pass + +def authenticate(server, login, password, db): + if db: + args = dict(db=db, login=login, key=password) + url = server + '/login?' + urllib.urlencode(args) + req = urllib2.Request(url) + else: + url = server + '/web/login' + args = dict(login=login, password=password) + req = urllib2.Request(url, urllib.urlencode(args)) + response = urllib2.urlopen(req) + if response.code != 200: + raise Exception("Could not authenticate to OpenERP server %r" % server) + cookie = response.headers.get('Set-Cookie') + return cookie + +def zip_module(path): + path = os.path.abspath(path) + if not os.path.isdir(path): + raise Exception("Could not find module directory %r" % path) + container, module_name = os.path.split(path) + temp = tempfile.mktemp(suffix='.zip') + temp = '/tmp/1/test.zip' + with zipfile.ZipFile(temp, 'w') as zfile: + for root, dirs, files in os.walk(path): + for file in files: + file_path = os.path.join(root, file) + zfile.write(file_path, file_path.split(container).pop()) + return temp + +if __name__ == '__main__': + parser = argparse.ArgumentParser(description='Deploy a module on an OpenERP server.') + parser.add_argument('path', help="Path of the module to deploy") + parser.add_argument('--url', dest='url', help='Url of the server (default=http://localhost:8069)', default="http://localhost:8069") + parser.add_argument('--database', dest='database', help='Database to use if server does not use db-filter.') + parser.add_argument('--login', dest='login', default="admin", help='Login (default=admin)') + parser.add_argument('--password', dest='password', default="admin", help='Password (default=admin)') + if len(sys.argv) == 1: + parser.print_help() + sys.exit(1) + args = parser.parse_args() + deploy_module(args.path, args.url, args.login, args.password, args.database) + # try: + # deploy_module(args.path, args.url, args.login, args.password, args.database) + # except Exception, e: + # print(e) + # sys.exit(1) -- cgit v1.2.3 From 62a5632aec7c14a094164862f8bc2f47060a7943 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 26 Mar 2014 16:08:42 +0100 Subject: [IMP] Use requests for http requests. python does not provide multipart encoding bzr revid: fme@openerp.com-20140326150842-h33yuiwsnrm8gmbk --- addons/base_import_module/bin/oe_module_deploy.py | 82 +++++++++++++++-------- 1 file changed, 54 insertions(+), 28 deletions(-) (limited to 'addons/base_import_module/bin') diff --git a/addons/base_import_module/bin/oe_module_deploy.py b/addons/base_import_module/bin/oe_module_deploy.py index d57f589901a..863d7875b40 100755 --- a/addons/base_import_module/bin/oe_module_deploy.py +++ b/addons/base_import_module/bin/oe_module_deploy.py @@ -3,34 +3,58 @@ import argparse import os import sys import tempfile -import urllib -import urllib2 import zipfile + +try: + import requests +except ImportError: + # no multipart encoding in stdlib and this script is temporary + sys.exit("This script requires the 'requests' module. ( pip install requests )") + +session = requests.session() + def deploy_module(module_path, url, login, password, db=None): if url.endswith('/'): url = url[:-1] + authenticate(url, login, password, db) + check_import(url) module_file = zip_module(module_path) - cookie = authenticate(url, login, password, db) - upload_module(url, module_file, cookie) + try: + return upload_module(url, module_file) + finally: + os.remove(module_file) + +def check_import(server): + url = server +'/base_import_module/check' + res = session.get(url) + if res.status_code == 404: + raise Exception("The server %r does not have the 'base_import_module' installed." % server) + elif res.status_code != 200: + raise Exception("Server %r returned %s http error.", (server, res.status_code)) -def upload_module(server, module_file, cookie): - pass +def upload_module(server, module_file): + print("Uploading module file...") + url = server + '/base_import_module/upload' + files = dict(mod_file=open(module_file, 'rb')) + res = session.post(url, files=files) + if res.status_code != 200: + raise Exception("Could not authenticate on server %r" % server) + return res.text def authenticate(server, login, password, db): + print("Connecting to server %r" % server) + print("Waiting for server authentication...") if db: + url = server + '/login' args = dict(db=db, login=login, key=password) - url = server + '/login?' + urllib.urlencode(args) - req = urllib2.Request(url) + res = session.get(url, params=args) else: url = server + '/web/login' args = dict(login=login, password=password) - req = urllib2.Request(url, urllib.urlencode(args)) - response = urllib2.urlopen(req) - if response.code != 200: + res = session.post(url, args) + if res.status_code != 200: raise Exception("Could not authenticate to OpenERP server %r" % server) - cookie = response.headers.get('Set-Cookie') - return cookie def zip_module(path): path = os.path.abspath(path) @@ -38,13 +62,17 @@ def zip_module(path): raise Exception("Could not find module directory %r" % path) container, module_name = os.path.split(path) temp = tempfile.mktemp(suffix='.zip') - temp = '/tmp/1/test.zip' - with zipfile.ZipFile(temp, 'w') as zfile: - for root, dirs, files in os.walk(path): - for file in files: - file_path = os.path.join(root, file) - zfile.write(file_path, file_path.split(container).pop()) - return temp + try: + print("Zipping module directory...") + with zipfile.ZipFile(temp, 'w') as zfile: + for root, dirs, files in os.walk(path): + for file in files: + file_path = os.path.join(root, file) + zfile.write(file_path, file_path.split(container).pop()) + return temp + except Exception: + os.remove(temp) + raise if __name__ == '__main__': parser = argparse.ArgumentParser(description='Deploy a module on an OpenERP server.') @@ -54,12 +82,10 @@ if __name__ == '__main__': parser.add_argument('--login', dest='login', default="admin", help='Login (default=admin)') parser.add_argument('--password', dest='password', default="admin", help='Password (default=admin)') if len(sys.argv) == 1: - parser.print_help() - sys.exit(1) + sys.exit(parser.print_help()) args = parser.parse_args() - deploy_module(args.path, args.url, args.login, args.password, args.database) - # try: - # deploy_module(args.path, args.url, args.login, args.password, args.database) - # except Exception, e: - # print(e) - # sys.exit(1) + try: + result = deploy_module(args.path, args.url, args.login, args.password, args.database) + print(result) + except Exception, e: + sys.exit("ERROR: %s" % e) -- cgit v1.2.3 From a0bbbf75c393339290676ede5d15d34c38cc7b29 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 26 Mar 2014 16:34:58 +0100 Subject: [IMP] Allow to disable ssl check bzr revid: fme@openerp.com-20140326153458-6yzhkipn9njcuxyc --- addons/base_import_module/bin/oe_module_deploy.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'addons/base_import_module/bin') diff --git a/addons/base_import_module/bin/oe_module_deploy.py b/addons/base_import_module/bin/oe_module_deploy.py index 863d7875b40..833d455e360 100755 --- a/addons/base_import_module/bin/oe_module_deploy.py +++ b/addons/base_import_module/bin/oe_module_deploy.py @@ -81,9 +81,15 @@ if __name__ == '__main__': parser.add_argument('--database', dest='database', help='Database to use if server does not use db-filter.') parser.add_argument('--login', dest='login', default="admin", help='Login (default=admin)') parser.add_argument('--password', dest='password', default="admin", help='Password (default=admin)') + parser.add_argument('--no-ssl-check', dest='no_ssl_check', action='store_true', help='Do not check ssl cert') if len(sys.argv) == 1: sys.exit(parser.print_help()) + args = parser.parse_args() + + if args.no_ssl_check: + session.verify = False + try: result = deploy_module(args.path, args.url, args.login, args.password, args.database) print(result) -- cgit v1.2.3 From e49b8f5ae32b072c7a22763ad9472fcce9265f04 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 26 Mar 2014 22:57:09 +0100 Subject: [FIX] /login is not webservice friendly, base_import_module uses it's own Exceptions in /base_import_module/* will generate 500 pages with a short message bzr revid: fme@openerp.com-20140326215709-esc4zkpfp8uzuww1 --- addons/base_import_module/bin/oe_module_deploy.py | 47 +++++++++-------------- 1 file changed, 18 insertions(+), 29 deletions(-) (limited to 'addons/base_import_module/bin') diff --git a/addons/base_import_module/bin/oe_module_deploy.py b/addons/base_import_module/bin/oe_module_deploy.py index 833d455e360..2412382cba5 100755 --- a/addons/base_import_module/bin/oe_module_deploy.py +++ b/addons/base_import_module/bin/oe_module_deploy.py @@ -14,52 +14,41 @@ except ImportError: session = requests.session() -def deploy_module(module_path, url, login, password, db=None): - if url.endswith('/'): - url = url[:-1] +def deploy_module(module_path, url, login, password, db=''): + url = url.rstrip('/') authenticate(url, login, password, db) - check_import(url) module_file = zip_module(module_path) try: return upload_module(url, module_file) finally: os.remove(module_file) -def check_import(server): - url = server +'/base_import_module/check' - res = session.get(url) - if res.status_code == 404: - raise Exception("The server %r does not have the 'base_import_module' installed." % server) - elif res.status_code != 200: - raise Exception("Server %r returned %s http error.", (server, res.status_code)) - def upload_module(server, module_file): print("Uploading module file...") url = server + '/base_import_module/upload' files = dict(mod_file=open(module_file, 'rb')) res = session.post(url, files=files) if res.status_code != 200: - raise Exception("Could not authenticate on server %r" % server) + raise Exception("Could not authenticate on server '%s'" % server) return res.text -def authenticate(server, login, password, db): - print("Connecting to server %r" % server) - print("Waiting for server authentication...") - if db: - url = server + '/login' - args = dict(db=db, login=login, key=password) - res = session.get(url, params=args) - else: - url = server + '/web/login' - args = dict(login=login, password=password) - res = session.post(url, args) - if res.status_code != 200: - raise Exception("Could not authenticate to OpenERP server %r" % server) +def authenticate(server, login, password, db=''): + print("Authenticating on server '%s' ..." % server) + + # Fixate session with a given db if any + session.get(server + '/web/login', params=dict(db=db)) + + args = dict(login=login, password=password, db=db) + res = session.post(server + '/base_import_module/login', args) + if res.status_code == 404: + raise Exception("The server '%s' does not have the 'base_import_module' installed." % server) + elif res.status_code != 200: + raise Exception(res.text) def zip_module(path): path = os.path.abspath(path) if not os.path.isdir(path): - raise Exception("Could not find module directory %r" % path) + raise Exception("Could not find module directory '%s'" % path) container, module_name = os.path.split(path) temp = tempfile.mktemp(suffix='.zip') try: @@ -78,7 +67,7 @@ if __name__ == '__main__': parser = argparse.ArgumentParser(description='Deploy a module on an OpenERP server.') parser.add_argument('path', help="Path of the module to deploy") parser.add_argument('--url', dest='url', help='Url of the server (default=http://localhost:8069)', default="http://localhost:8069") - parser.add_argument('--database', dest='database', help='Database to use if server does not use db-filter.') + parser.add_argument('--db', dest='db', help='Database to use if server does not use db-filter.') parser.add_argument('--login', dest='login', default="admin", help='Login (default=admin)') parser.add_argument('--password', dest='password', default="admin", help='Password (default=admin)') parser.add_argument('--no-ssl-check', dest='no_ssl_check', action='store_true', help='Do not check ssl cert') @@ -91,7 +80,7 @@ if __name__ == '__main__': session.verify = False try: - result = deploy_module(args.path, args.url, args.login, args.password, args.database) + result = deploy_module(args.path, args.url, args.login, args.password, args.db) print(result) except Exception, e: sys.exit("ERROR: %s" % e) -- cgit v1.2.3