Koha-community
/
git-bz
mirror of https://gitlab.com/koha-community/git-bz.git
2
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Add support for bz-user and bz-password and authenticating directly. 

Conflicts:

	git-bz
fishsoup
software.coop worker 13 years ago
committed by Jared Camins-Esakov
parent
128d9296ac
commit
3e3c88f678
2 changed files with 50 additions and 13 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 58
      git-bz
  2. 5
      git-bz.txt

58
git-bz
View File

@ -82,7 +82,8 @@ import base64
import cPickle as pickle
from ConfigParser import RawConfigParser, NoOptionError
import httplib
import optparse
import urllib
from optparse import OptionParser
import os
try:
from sqlite3 import dbapi2 as sqlite
@ -384,6 +385,7 @@ def tracker_get_auth_password(tracker):
return config['auth-password']
return None
def merge_default_fields_from_dict(default_fields, d):
for key, value in d.iteritems():
if key.startswith("default-"):
@ -392,6 +394,18 @@ def merge_default_fields_from_dict(default_fields, d):
continue
default_fields[param] = value
def tracker_get_bz_user(tracker):
config = get_config(tracker)
if 'bz-user' in config:
return config['bz-user']
return None
def tracker_get_bz_password(tracker):
config = get_config(tracker)
if 'bz-password' in config:
return config['bz-password']
return None
def get_default_fields(tracker):
config = get_config(tracker)
@ -417,13 +431,15 @@ class BugParseError(Exception):
# uniquely identifies a bug on a server, though until we try
# to load it (and create a Bug) we don't know if it actually exists.
class BugHandle:
def __init__(self, host, path, https, id, auth_user=None, auth_password=None):
def __init__(self, host, path, https, id, auth_user=None, auth_password=None, bz_user=None, bz_password=None):
self.host = host
self.path = path
self.https = https
self.id = id
self.auth_user = auth_user
self.auth_password = auth_password
self.bz_user = bz_user
self.bz_password = bz_password
# ensure that the path to the bugzilla installation is an absolute path
# so that it will still work even if their config option specifies
@ -484,7 +500,9 @@ class BugHandle:
https=parseresult.scheme=="https",
id=bugid,
auth_user=user,
auth_password=password)
auth_password=password,
bz_user=tracker_get_bz_user(parseresult.hostname),
bz_password=tracker_get_bz_password(parseresult.hostname))
colon = bug_reference.find(":")
if colon > 0:
@ -502,11 +520,13 @@ class BugHandle:
path = tracker_get_path(tracker)
auth_user = tracker_get_auth_user(tracker)
auth_password = tracker_get_auth_password(tracker)
bz_user = tracker_get_bz_user(tracker)
bz_password = tracker_get_bz_password(tracker)
if not re.match(r"^.*\.[a-zA-Z]{2,}$", host):
raise BugParseError("'%s' doesn't look like a valid bugzilla host or alias" % host)
return BugHandle(host=host, path=path, https=https, id=id, auth_user=auth_user, auth_password=auth_password)
return BugHandle(host=host, path=path, https=https, id=id, auth_user=auth_user, auth_password=auth_password, bz_user=bz_user, bz_password=bz_password)
@staticmethod
def parse_or_die(str):
@ -881,20 +901,32 @@ def get_connection(host, https):
return connections[identifier]
class BugServer(object):
def __init__(self, host, path, https, auth_user=None, auth_password=None):
def __init__(self, host, path, https, auth_user=None, auth_password=None, bz_user=None, bz_password=None):
self.host = host
self.path = path
self.https = https
self.auth_user = auth_user
self.auth_password = auth_password
self.bz_password = bz_password
self.bz_user = bz_user
self.cookies = get_bugzilla_cookies(host)
self.cookiestring = ''
self._xmlrpc_proxy = None
def get_cookie_string(self):
return ("Bugzilla_login=%s; Bugzilla_logincookie=%s" %
(self.cookies['Bugzilla_login'], self.cookies['Bugzilla_logincookie']))
if self.cookiestring == '':
if self.bz_user and self.bz_password:
connection = get_connection(self.host, self.https)
connection.request("POST", self.path + "/index.cgi", urllib.urlencode({'Bugzilla_login':self.bz_user,'Bugzilla_password':self.bz_password}))
res = connection.getresponse()
self.cookiestring = res.getheader('set-cookie')
connection.close()
else:
self.cookies = get_bugzilla_cookies(host)
self.cookiestring = ("Bugzilla_login=%s; Bugzilla_logincookie=%s" %
(self.cookies['Bugzilla_login'], self.cookies['Bugzilla_logincookie']))
return self.cookiestring
def send_request(self, method, url, data=None, headers={}):
headers = dict(headers)
@ -1082,10 +1114,10 @@ servers = {}
# host/https of the server to avoid doing too many redirections, and
# so the host,https we connect to may be different than what we use
# to look up the server.
def get_bug_server(host, path, https, auth_user, auth_password):
def get_bug_server(host, path, https, auth_user, auth_password, bz_user, bz_password):
identifier = (host, path, https)
if not identifier in servers:
servers[identifier] = BugServer(host, path, https, auth_user, auth_password)
servers[identifier] = BugServer(host, path, https, auth_user, auth_password, bz_user, bz_password)
return servers[identifier]
@ -1334,7 +1366,7 @@ class Bug(object):
@staticmethod
def load(bug_reference, attachmentdata=False):
server = get_bug_server(bug_reference.host, bug_reference.path, bug_reference.https, bug_reference.auth_user, bug_reference.auth_password)
server = get_bug_server(bug_reference.host, bug_reference.path, bug_reference.https, bug_reference.auth_user, bug_reference.auth_password, bug_reference.bz_user, bug_reference.bz_password)
bug = Bug(server)
bug._load(bug_reference.id, attachmentdata)
@ -1347,9 +1379,11 @@ class Bug(object):
path = tracker_get_path(tracker)
auth_user = tracker_get_auth_user(tracker)
auth_password = tracker_get_auth_password(tracker)
bz_user = tracker_get_bz_user(tracker)
bz_password = tracker_get_bz_password(tracker)
default_fields = get_default_fields(tracker)
server = get_bug_server(host, path, https, auth_user, auth_password)
server = get_bug_server(host, path, https, auth_user, auth_password, bz_user, bz_password)
bug = Bug(server)
bug._create(product, component, short_desc, comment, default_fields)

5
git-bz.txt
View File

@ -27,12 +27,15 @@ applying patches in bugs to your current tree, and closing bugs once
you've pushed the fixes publicly can be done completely from the
command line without having to go to your web browser.
Authentication for git-bz is done by reading the cookies for the
Authentication for git-bz can be done by reading the cookies for the
Bugzilla host from your web browser. In order to do this, git-bz needs
to know how to access the cookies for your web browser; git-bz
currently is able to do this for Firefox, Epiphany, Galeon and Chromium on
Linux.
Alternatively, you can set the bz-user and bz-password in the
git config for each tracker.
EXAMPLE SESSION
---------------

Write Preview
Loading…
Cancel
Save