packagedb-cli-commits March 2014

packagedb-cli-commits@lists.stg.fedorahosted.org

1 participants
188 discussions

[packagedb-cli/pkgdb2] Handle the logging from the API as well
by Pierre-YvesChibon 05 Mar '14

05 Mar '14

commit d72b8f71d55969ed17a87e167557539fe73dcac4 Author: Pierre-Yves Chibon <pingou(a)pingoured.fr> Date: Wed Mar 5 16:47:17 2014 +0100 Handle the logging from the API as well pkgdb2-cli | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) --- diff --git a/pkgdb2-cli b/pkgdb2-cli index 2db1686..b738a4f 100755 --- a/pkgdb2-cli +++ b/pkgdb2-cli @@ -41,9 +41,11 @@ reset = "\033[0;0m" # Initial simple logging stuff logging.basicConfig() -log = logging.getLogger("pkgdb") +pkgdblog = logging.getLogger("pkgdb") +log = logging.getLogger("pkgdb-cli") if '--debug' in sys.argv: log.setLevel(logging.DEBUG) + pkgdblog.setLevel(logging.DEBUG) #pkgdbclient.debug = True elif '--verbose' in sys.argv: log.setLevel(logging.INFO)

1 0

[packagedb-cli/pkgdb2] Improve documentation for _parse_service_form
by Pierre-YvesChibon 05 Mar '14

05 Mar '14

commit 53e531c7bd414c47c09b3d506280d7516d556a75 Author: Pierre-Yves Chibon <pingou(a)pingoured.fr> Date: Wed Mar 5 16:46:20 2014 +0100 Improve documentation for _parse_service_form pkgdb.py | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) --- diff --git a/pkgdb.py b/pkgdb.py index f182ee8..e83b889 100644 --- a/pkgdb.py +++ b/pkgdb.py @@ -36,7 +36,11 @@ class PkgDBException(Exception): def _parse_service_form(response): - """ Retrieve the attributes from the html form. """ + """ Retrieve the attributes from the html login form. + + Basically this extracts all the field of the form so that we can + forward them to the OpenID API. + """ import bs4 parsed = bs4.BeautifulSoup(response.text)

1 0

[packagedb-cli/pkgdb2] Start adding some logging also to the API
by Pierre-YvesChibon 05 Mar '14

05 Mar '14

commit 9644fac37d9451b6a9d9562be7d6306f01f51fa2 Author: Pierre-Yves Chibon <pingou(a)pingoured.fr> Date: Wed Mar 5 16:46:03 2014 +0100 Start adding some logging also to the API pkgdb.py | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) --- diff --git a/pkgdb.py b/pkgdb.py index 80d5498..f182ee8 100644 --- a/pkgdb.py +++ b/pkgdb.py @@ -16,9 +16,13 @@ """ import json +import logging import requests +logging.basicConfig() +LOG = logging.getLogger("pkgdb") + PKGDB_URL = 'http://209.132.184.188' @@ -30,6 +34,7 @@ class PkgDBException(Exception): ''' pass + def _parse_service_form(response): """ Retrieve the attributes from the html form. """ import bs4 @@ -149,6 +154,7 @@ class PkgDB(object): output = req.json() if req.status_code != 200: + LOG.debug('full output %s', outout) raise PkgDBException(output['error']) return output @@ -173,6 +179,7 @@ class PkgDB(object): output = req.json() if req.status_code != 200: + LOG.debug('full output %s', outout) raise PkgDBException(output['error']) return output @@ -200,6 +207,7 @@ class PkgDB(object): output = req.json() if req.status_code != 200: + LOG.debug('full output %s', outout) raise PkgDBException(output['error']) return output @@ -229,6 +237,7 @@ class PkgDB(object): output = req.json() if req.status_code != 200: + LOG.debug('full output %s', outout) raise PkgDBException(output['error']) return output @@ -258,6 +267,7 @@ class PkgDB(object): output = req.json() if req.status_code != 200: + LOG.debug('full output %s', outout) raise PkgDBException(output['error']) return output @@ -289,6 +299,7 @@ class PkgDB(object): output = req.json() if req.status_code != 200: + LOG.debug('full output %s', outout) raise PkgDBException(output['error']) return output @@ -318,6 +329,7 @@ class PkgDB(object): output = req.json() if req.status_code != 200: + LOG.debug('full output %s', outout) raise PkgDBException(output['error']) return output @@ -353,6 +365,7 @@ class PkgDB(object): output = req.json() if req.status_code != 200: + LOG.debug('full output %s', outout) raise PkgDBException(output['error']) return output

1 0

[packagedb-cli/pkgdb2] Work on pkgdb2-cli
by Pierre-YvesChibon 05 Mar '14

05 Mar '14

commit d9e62f5756b75e7509244771aa5e096f2fa271d9 Author: Pierre-Yves Chibon <pingou(a)pingoured.fr> Date: Wed Mar 5 16:31:30 2014 +0100 Work on pkgdb2-cli - Save the user's username - Only consider the active branches when retrieving the active branches - Add option to unorphan all my packages (you never know) - Adjust owner to poc - Fix the do_orphan method for pkgdb2 - Fix the do_unorphan method for pkgdb2 - Fix actions -> action in do_request - Fix the do_request method for pkgdb2 - User get when retrieving messages to be on the safe side - Add little more debuging information when something goes south. pkgdb2-cli | 57 +++++++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 41 insertions(+), 16 deletions(-) --- diff --git a/pkgdb2-cli b/pkgdb2-cli index 899bf00..2db1686 100755 --- a/pkgdb2-cli +++ b/pkgdb2-cli @@ -87,6 +87,7 @@ def __do_login(username=None, password=None): log.debug('Could not read Fedora cert, using login name') username = raw_input('FAS username: ') password = getpass.getpass('FAS password: ') + pkgdbclient.username = username pkgdbclient.login(username, password) def _get_acls_info(acls): @@ -110,7 +111,8 @@ def _get_active_branch(packagename=None): if packagename: output = pkgdbclient.get_package(packagename) for pkg in output['packages']: - branches.append(pkg['collection']['branchname']) + if pkg['collection']['status'] != 'EOL': + branches.append(pkg['collection']['branchname']) else: output = pkgdbclient.get_collections(status='EOL,Under Development') for collect in output['collections']: @@ -303,8 +305,11 @@ def setup_parser(): help="Branch of the package to unorphan " "(default: 'devel', can be: 'all')") parser_unorphan.add_argument( - '--owner', default=None, - help="FAS username of the owner of the package " + '--all', action="store_true", default=False, + help="Unorphan all your packages") + parser_unorphan.add_argument( + '--poc', default=None, + help="FAS username of the new point of contact of the package " "This allows to give your package or an orphaned " "package to someone else. " "(default: current FAS user)") @@ -489,13 +494,15 @@ def do_orphan(args): else: branches = [args.branch] + __do_login(args.username) + output = pkgdbclient.orphan_packages(pkgs, branches) - for msg in output['messages']: + for msg in output.get('messages', []): print msg if args.retire is True: output = pkgdbclient.retire_packages(pkgs, branches) - for msg in output['messages']: + for msg in output.get('messages', []): print msg @@ -503,7 +510,7 @@ def do_unorphan(args): log.info("user : {0}".format(args.username)) log.info("package : {0}".format(args.package)) log.info("branch : {0}".format(args.branch)) - log.info("poc : {0}".format(args.owner)) + log.info("poc : {0}".format(args.poc)) if args.all is True: pkgs = _get_user_packages(args.username) else: @@ -513,8 +520,13 @@ def do_unorphan(args): else: branches = [args.branch] - output = pkgdbclient.unorphan_packages(pkgs, branches) - for msg in output['messages']: + __do_login(args.username) + + username = args.poc or args.username or pkgdbclient.username + log.info("new poc : {0}".format(username)) + + output = pkgdbclient.unorphan_packages(pkgs, branches, username) + for msg in output.get('messages', []): print msg @@ -524,9 +536,9 @@ def do_request(args): log.info("branch : {0}".format(args.branch)) log.info("acl : {0}".format(args.action)) log.info("cancel : {0}".format(args.cancel)) - actions = args.action - if actions == 'all': - actions = actionlist + action = args.action + if action == 'all': + action = actionlist elif action not in actionlist: raise ActionError( 'Action "{0}" is not in the list: {1},all'.format( @@ -540,8 +552,18 @@ def do_request(args): if args.cancel: status = 'Obsolete' - update_acl(args.package, branches=branch, acls=actions, status=status, - user=args.username) + __do_login(args.username) + log.info("user : {0}".format(pkgdbclient.username)) + + output = pkgdbclient.update_acl( + args.package, + branches=branch, + acls=action, + status=status, + user=pkgdbclient.username) + + for msg in output.get('messages', []): + print msg def do_update(args): @@ -577,9 +599,8 @@ def do_update(args): acls=action, status=status, user=args.user) - if output['output'] == 'ok': - for message in output['messages']: - print message + for msg in output.get('messages', []): + print msg def do_branch(args): @@ -619,15 +640,19 @@ if __name__ == '__main__': print "\nError: {0}".format(e) sys.exit(2) except ServerError, e: + log.debug('ServerError') print '{0}'.format(e) sys.exit(3) except ActionError, e: + log.debug('ActionError') print '{0}'.format(e.message) sys.exit(7) except AppError, e: + log.debug('AppError') print '{0}: {1}'.format(e.name, e.message) sys.exit(4) except PkgDBException, e: + log.debug('PkgDBException') print '{0}'.format(e) sys.exit(8) except ValueError, e:

1 0

[packagedb-cli/pkgdb2] Fix login against other instances of pkgdb, remember the user's username and fix the update_acl call
by Pierre-YvesChibon 05 Mar '14

05 Mar '14

commit 9ad8cfd417b7360d6f729d84f9000ab21ea1c37d Author: Pierre-Yves Chibon <pingou(a)pingoured.fr> Date: Wed Mar 5 16:28:33 2014 +0100 Fix login against other instances of pkgdb, remember the user's username and fix the update_acl call pkgdb.py | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) --- diff --git a/pkgdb.py b/pkgdb.py index b0ce83b..80d5498 100644 --- a/pkgdb.py +++ b/pkgdb.py @@ -49,15 +49,18 @@ class PkgDB(object): ''' - def __init__(self, url=PKGDB_URL): + def __init__(self, url=PKGDB_URL, username=None): ''' Constructor fo the PkgDB object used to query the package database. :kwarg url: the basic url to the package DB instance to query + :kwarg username: the FAS username of the user performing the + actions ''' self.url = url self.session = requests.session() + self.username = username self.__logged = False @property @@ -84,7 +87,7 @@ class PkgDB(object): motif = re.compile(fedora_openid) # Log into the service - response = self.session.get(PKGDB_URL + '/login/') + response = self.session.get(self.url + '/login/') if '<title>OpenID transaction in progress</title>' \ in response.text: @@ -115,13 +118,13 @@ class PkgDB(object): verify=not openid_insecure) output = response.json() + if not output['success']: + raise PkgDBException(output['message']) + response = self.session.post( output['response']['openid.return_to'], data=output['response']) - if not output['success']: - raise AuthError(output['message']) - self.__logged = True return output @@ -337,8 +340,8 @@ class PkgDB(object): args = { 'pkg_name': package, - 'pkg_branch': ','.join(branches), - 'pkg_acl': ','.join(acls), + 'pkg_branch': branches, + 'pkg_acl': acls, 'acl_status': status, 'pkg_user': user, }

1 0

[packagedb-cli/pkgdb2] Support login in with the CLI and updating ACL request
by Pierre-YvesChibon 05 Mar '14

05 Mar '14

commit e9f19467865e874cdfd57d8d40731d4c8fef8da5 Author: Pierre-Yves Chibon <pingou(a)pingoured.fr> Date: Wed Mar 5 12:24:03 2014 +0100 Support login in with the CLI and updating ACL request pkgdb2-cli | 35 +++++++++++++++++++++++++++++++++-- 1 files changed, 33 insertions(+), 2 deletions(-) --- diff --git a/pkgdb2-cli b/pkgdb2-cli index b183837..899bf00 100755 --- a/pkgdb2-cli +++ b/pkgdb2-cli @@ -67,6 +67,28 @@ class ActionError(Exception): pass +def __do_login(username=None, password=None): + """ Returned a BaseClient with authentification + + If the username is None, tries to retrieve it from fedora_cert. + + :arg pkgdbclient a PackageDB object to which username and password + are added + :karg username FAS username, if None it is asked to the user + :karg password FAS password, if None it is asked to the user + """ + if pkgdbclient.logged: + return + else: + if username is None: + try: + username = fedora_cert.read_user_cert() + except: + log.debug('Could not read Fedora cert, using login name') + username = raw_input('FAS username: ') + password = getpass.getpass('FAS password: ') + pkgdbclient.login(username, password) + def _get_acls_info(acls): ''' Re-order the ACLs as provided by the PkgDB API in a way that can be easily printed. @@ -547,8 +569,17 @@ def do_update(args): if args.approve: status = "Approved" - update_acl(args.package, branches=branch, acls=action, status=status, - user=args.username) + __do_login(args.username) + + output = pkgdbclient.update_acl( + args.package, + branches=branch, + acls=action, + status=status, + user=args.user) + if output['output'] == 'ok': + for message in output['messages']: + print message def do_branch(args):

1 0

[packagedb-cli/pkgdb2] Add a login mechanism, use requests' json converted and use a session local to the object
by Pierre-YvesChibon 05 Mar '14

05 Mar '14

commit 65ce669f9d245b5e5de7402f54ad322a008914a7 Author: Pierre-Yves Chibon <pingou(a)pingoured.fr> Date: Wed Mar 5 12:23:37 2014 +0100 Add a login mechanism, use requests' json converted and use a session local to the object pkgdb.py | 115 ++++++++++++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 98 insertions(+), 17 deletions(-) --- diff --git a/pkgdb.py b/pkgdb.py index c8d827f..b0ce83b 100644 --- a/pkgdb.py +++ b/pkgdb.py @@ -30,6 +30,18 @@ class PkgDBException(Exception): ''' pass +def _parse_service_form(response): + """ Retrieve the attributes from the html form. """ + import bs4 + + parsed = bs4.BeautifulSoup(response.text) + inputs = {} + for child in parsed.form.find_all(name='input'): + if child.attrs['type'] == 'submit': + continue + inputs[child.attrs['name']] = child.attrs['value'] + return (parsed.form.attrs['action'], inputs) + class PkgDB(object): ''' PkgDB class used to interact with the Package DB instance via its @@ -45,6 +57,75 @@ class PkgDB(object): ''' self.url = url + self.session = requests.session() + self.__logged = False + + @property + def logged(self): + ''' Return whether the user if logged in or not. ''' + return self.__logged + + def login(self, username, password, openid_insecure=False): + ''' Login the user on pkgdb2. + + :arg username: the FAS username of the user. + :arg password: the FAS password of the user. + :kwarg openid_insecure: If True, do not check the openid server + certificates against their CA's. This means that man-in-the + middle attacks are possible against the `BaseClient`. You might + turn this option on for testing against a local version of a + server with a self-signed certificate but it should be off in + production. + ''' + import re + + fedora_openid_api = 'https://id.fedoraproject.org/api/v1/' + fedora_openid = '^http(s)?:\/\/(|stg.|dev.)?id\.fedoraproject\.org(/)?' + motif = re.compile(fedora_openid) + + # Log into the service + response = self.session.get(PKGDB_URL + '/login/') + + if '<title>OpenID transaction in progress</title>' \ + in response.text: + # requests.session should hold onto this for us.... + openid_url, data = _parse_service_form(response) + if not motif.match(openid_url): + raise FedoraServiceError( + 'Un-expected openid provider asked: %s' % openid_url) + else: + data = {} + for r in response.history: + if motif.match(r.url): + parsed = parse_qs(urlparse(r.url).query) + for key, value in parsed.items(): + data[key] = value[0] + break + else: + raise FedoraServiceError( + 'Unable to determine openid parameters from login: %r' % + openid_url) + + # Contact openid provider + data['username'] = username + data['password'] = password + response = self.session.post( + fedora_openid_api, + data, + verify=not openid_insecure) + output = response.json() + + response = self.session.post( + output['response']['openid.return_to'], + data=output['response']) + + if not output['success']: + raise AuthError(output['message']) + + self.__logged = True + + return output + def get_collections(self, pattern='*', status=None): ''' Return the list of collections matching the provided criterias. @@ -58,11 +139,11 @@ class PkgDB(object): 'status': status, } - req = requests.get( + req = self.session.get( '{0}/api/collections/'.format(self.url), params=args ) - output = json.loads(req.text) + output = req.json() if req.status_code != 200: raise PkgDBException(output['error']) @@ -82,11 +163,11 @@ class PkgDB(object): 'pkg_clt': branch, } - req = requests.get( + req = self.session.get( '{0}/api/package/'.format(self.url), params=args ) - output = json.loads(req.text) + output = req.json() if req.status_code != 200: raise PkgDBException(output['error']) @@ -105,15 +186,15 @@ class PkgDB(object): args = { 'pattern': pattern, 'branches': branch, - 'owner': poc, + 'poc': poc, 'orphan': orphan, } - req = requests.get( + req = self.session.get( '{0}/api/packages/'.format(self.url), params=args ) - output = json.loads(req.text) + output = req.json() if req.status_code != 200: raise PkgDBException(output['error']) @@ -138,11 +219,11 @@ class PkgDB(object): 'clt_name': ','.join(branches), } - req = requests.post( + req = self.session.post( '{0}/api/package/orphan/'.format(self.url), data=args ) - output = json.loads(req.text) + output = req.json() if req.status_code != 200: raise PkgDBException(output['error']) @@ -167,11 +248,11 @@ class PkgDB(object): 'clt_name': ','.join(branches), } - req = requests.post( + req = self.session.post( '{0}/api/package/retire/'.format(self.url), data=args ) - output = json.loads(req.text) + output = req.json() if req.status_code != 200: raise PkgDBException(output['error']) @@ -198,11 +279,11 @@ class PkgDB(object): 'pkg_poc': poc, } - req = requests.post( + req = self.session.post( '{0}/api/package/unorphan/'.format(self.url), data=args ) - output = json.loads(req.text) + output = req.json() if req.status_code != 200: raise PkgDBException(output['error']) @@ -227,11 +308,11 @@ class PkgDB(object): 'clt_name': ','.join(branches), } - req = requests.post( + req = self.session.post( '{0}/api/package/unretire/'.format(self.url), data=args ) - output = json.loads(req.text) + output = req.json() if req.status_code != 200: raise PkgDBException(output['error']) @@ -262,11 +343,11 @@ class PkgDB(object): 'pkg_user': user, } - req = requests.post( + req = self.session.post( '{0}/api/package/acl/'.format(self.url), data=args ) - output = json.loads(req.text) + output = req.json() if req.status_code != 200: raise PkgDBException(output['error'])

1 0

[packagedb-cli/pkgdb2] Bug and typo fixes to the CLI
by Pierre-YvesChibon 05 Mar '14

05 Mar '14

commit 2b5a7f92f5ff81549f765dc35175a11255bf9166 Author: Pierre-Yves Chibon <pingou(a)pingoured.fr> Date: Wed Mar 5 12:22:32 2014 +0100 Bug and typo fixes to the CLI - Update copyright year - Import missing exception and catch it - Fix version - Add ActionError class that is thrown in the code and catch it - Use user instead of username where it is meant to - Sort the output of the list command - Use POC since we don't use owner anymore - Fix typo action != actions pkgdb2-cli | 38 +++++++++++++++++++++++++------------- 1 files changed, 25 insertions(+), 13 deletions(-) --- diff --git a/pkgdb2-cli b/pkgdb2-cli old mode 100644 new mode 100755 index 84aec93..b183837 --- a/pkgdb2-cli +++ b/pkgdb2-cli @@ -4,7 +4,7 @@ """ # pkgdb2 - a commandline frontend for the Fedora package database v2 # -# Copyright (C) 2013 Pierre-Yves Chibon +# Copyright (C) 2013-2014 Pierre-Yves Chibon # Author: Pierre-Yves Chibon <pingou(a)pingoured.fr> # # This program is free software; you can redistribute it and/or modify @@ -18,7 +18,7 @@ from fedora.client import (AccountSystem, AppError, AuthError, ServerError) from bugzilla.rhbugzilla import RHBugzilla -from pkgdb import PkgDB +from pkgdb import PkgDB, PkgDBException import argparse import logging import getpass @@ -29,7 +29,7 @@ import fedora_cert import timeit -version = '2.0.0' +version = '2.0' kojiclient = koji.ClientSession( 'http://koji.fedoraproject.org/kojihub', {}) pkgdbclient = PkgDB('http://209.132.184.188/') @@ -61,6 +61,12 @@ if '--test' in sys.argv: actionlist = ['watchbugzilla', 'watchcommits', 'commit', 'approveacls'] +class ActionError(Exception): + """ This class is raised when an ACL action is requested but not in + the list of allowed action. """ + pass + + def _get_acls_info(acls): ''' Re-order the ACLs as provided by the PkgDB API in a way that can be easily printed. @@ -234,7 +240,7 @@ def setup_parser(): default=False, dest='eol', help="List all orphaned and eol'd packages") parser_list.add_argument( - '--user', dest='username', default=False, + '--user', dest='user', default=False, help="List all the packages of the user <user>") parser_list.add_argument( '--branch', dest='branch', default=None, @@ -413,12 +419,12 @@ def do_list(args): log.info("pattern : {0}".format(args.pattern)) log.info("all : {0}".format(args.all)) log.info("orphaned : {0}".format(args.orphaned)) - log.info("user : {0}".format(args.username)) + log.info("user : {0}".format(args.user)) log.info("name only: {0}".format(args.name_only)) log.info("branch : {0}".format(args.branch)) log.info(args) pattern = args.pattern - if not pattern and args.all: + if not pattern or args.all: pattern = '*' elif not pattern and not args.all: raise argparse.ArgumentTypeError("Not enough arguments given") @@ -429,11 +435,11 @@ def do_list(args): output = pkgdbclient.get_packages( pattern=pattern, branch=args.branch, - poc=args.username, + poc=args.user, orphan=args.orphaned ) cnt = 0 - for pkg in output['packages']: + for pkg in sorted(output['packages'], key = lambda pkg: (pkg['name'])): out = " " + pkg['name'] + ' ' * (33 - len(pkg['name'])) + \ pkg['summary'] if args.name_only: @@ -475,7 +481,7 @@ def do_unorphan(args): log.info("user : {0}".format(args.username)) log.info("package : {0}".format(args.package)) log.info("branch : {0}".format(args.branch)) - log.info("owner : {0}".format(args.owner)) + log.info("poc : {0}".format(args.owner)) if args.all is True: pkgs = _get_user_packages(args.username) else: @@ -525,9 +531,9 @@ def do_update(args): log.info("approve : {0}".format(args.approve)) log.info("deny : {0}".format(args.deny)) - actions = args.action - if actions == 'all': - actions = actionlist + action = args.action + if action == 'all': + action = actionlist elif action not in actionlist: raise ActionError( 'Action "{0}" is not in the list: {1},all'.format( @@ -541,7 +547,7 @@ def do_update(args): if args.approve: status = "Approved" - update_acl(args.package, branches=branch, acls=actions, status=status, + update_acl(args.package, branches=branch, acls=action, status=status, user=args.username) @@ -584,9 +590,15 @@ if __name__ == '__main__': except ServerError, e: print '{0}'.format(e) sys.exit(3) + except ActionError, e: + print '{0}'.format(e.message) + sys.exit(7) except AppError, e: print '{0}: {1}'.format(e.name, e.message) sys.exit(4) + except PkgDBException, e: + print '{0}'.format(e) + sys.exit(8) except ValueError, e: print 'Error: {0}'.format(e) print 'Did you log in?'

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

packagedb-cli-commits March 2014