Differential D7

Remove bugzilla cookie code
ClosedPublic
Actions

Authored by mkrizek on Feb 12 2014, 11:04 AM.

Details

Reviewers
tflink
Maniphest Tasks
T82: Remove bugzilla cookie code from blockerbugs
Commits
rBLKRad05eedea045: Remove bugzilla cookie code
rBLKRbd6df14fb711: Remove bugzilla cookie code
Summary

Fixes: T82

Test Plan

Tested on my dev machine, works for me.

Diff Detail

Branch
hotfix/T82-bzcookiefix
Lint
No Linters Available
Unit
No Unit Test Coverage
tflink accepted this revision.Feb 13 2014, 2:48 AM

Looks good to me, please merge into develop.

If you have the time/interest, please do a release and deploy to either stg or dev (let me know otherwise so I can do it). I'd like to get this released so that cron on blockerbugs01 stops spamming me and sync starts actually working :)

mkrizek closed this revision.Feb 13 2014, 10:47 AM

Pushed to develop, cherry-picked in master, released as 0.4.3.1 and deployed to dev.

Revision Contents

Diff 14

View Options

blockerbugs/cli.py

Show First 20 Lines • Show All 94 Lines • ▼ Show 20 Line(s)80 else:
95 # there should be only one current version, the new version as current if 95​ # there should be only one current version, the new version as current if
96 # there are no current releases defined 96​ # there are no current releases defined
97 if current_milestones <= 0: 97​ if current_milestones <= 0:
98 new_milestone.current = True 98​ new_milestone.current = True
99 db.session.add(new_milestone) 99​ db.session.add(new_milestone)
100 db.session.commit() 100​ db.session.commit()
101 101​
102 102​
103def generate_config(dburi=None, bugzilla_cookie=None): 103​def generate_config(dburi=None):
104 config_filename = os.path.abspath('conf/settings.py') 104​ config_filename = os.path.abspath('conf/settings.py')
105 if os.path.exists(config_filename): 105​ if os.path.exists(config_filename):
106 print "configuration file %s already exists, exiting" % config_filename 106​ print "configuration file %s already exists, exiting" % config_filename
107 sys.exit(0) 107​ sys.exit(0)
108 108​
109 secret_key = os.urandom(24).encode('string_escape') 109​ secret_key = os.urandom(24).encode('string_escape')
110 110​
111 config_file = open(config_filename, 'w') 111​ config_file = open(config_filename, 'w')
112 config_file.write('SECRET_KEY = \'%s\'\n' % secret_key) 112​ config_file.write('SECRET_KEY = \'%s\'\n' % secret_key)
113 if dburi: 113​ if dburi:
114 config_file.write('SQLALCHEMY_DATABASE_URI = ') 114​ config_file.write('SQLALCHEMY_DATABASE_URI = ')
115 config_file.write('\'%s\'\n' % dburi) 115​ config_file.write('\'%s\'\n' % dburi)
116 else: 116​ else:
117 config_file.write('SQLALCHEMY_DATABASE_URI = \'\'\n') 117​ config_file.write('SQLALCHEMY_DATABASE_URI = \'\'\n')
118 # leave places for the other config values generally needed 118​ # leave places for the other config values generally needed
119 config_file.write('FAS_ADMIN_GROUP = \'\'\n') 119​ config_file.write('FAS_ADMIN_GROUP = \'\'\n')
120 config_file.write('FAS_USER = \'\'\n') 120​ config_file.write('FAS_USER = \'\'\n')
121 config_file.write('FAS_PASSWORD = \'\'\n') 121​ config_file.write('FAS_PASSWORD = \'\'\n')
122 if bugzilla_cookie: ​
123 config_file.write('BUGZILLA_COOKIE = \'%s\'\n' % str(bugzilla_cookie)) ​
124 else: ​
125 config_file.write('BUGZILLA_COOKIE = None\n') ​
126 config_file.close() 122​ config_file.close()
127 123​
128 124​
129def check_blockers(bzurl): 125​def check_blockers(bzurl):
130 bzinterface = BlockerBugs(url=bzurl) 126​ bzinterface = BlockerBugs(url=bzurl)
131 active_milestones = Milestone.query.filter_by(active=True).all() 127​ active_milestones = Milestone.query.filter_by(active=True).all()
132 for milestone in active_milestones: 128​ for milestone in active_milestones:
133 missing_bugs = [] 129​ missing_bugs = []
▲ Show 20 Lines • Show All 57 Lines • ▼ Show 20 Line(s)186 parser.add_option('-c', '--check', action='store_true', default=False,
191 help='Force check for missing blocker bugs after sync') 187​ help='Force check for missing blocker bugs after sync')
192 parser.add_option('-d', '--dburi', dest='dburi', help='dburi to use') 188​ parser.add_option('-d', '--dburi', dest='dburi', help='dburi to use')
193 parser.add_option('-r', '--release', dest='release', help='release number') 189​ parser.add_option('-r', '--release', dest='release', help='release number')
194 parser.add_option('-m', '--milestone', dest='milestone', 190​ parser.add_option('-m', '--milestone', dest='milestone',
195 help='Milestone name') 191​ help='Milestone name')
196 parser.add_option('-b', '--blocker', dest='blocker', 192​ parser.add_option('-b', '--blocker', dest='blocker',
197 help='blocker tracking bug id') 193​ help='blocker tracking bug id')
198 parser.add_option('-a', '--accepted', dest='fe', help='FE tracking bug id') 194​ parser.add_option('-a', '--accepted', dest='fe', help='FE tracking bug id')
199 parser.add_option('-z', '--bzcookie', dest='bzcookie', default=None, ​
200 help='location of bugzilla cookie file to use') ​
201 195​
202 (options, args) = parser.parse_args() 196​ (options, args) = parser.parse_args()
203 197​
204 if len(args) < 1: 198​ if len(args) < 1:
205 print "need to have at least 1 command" 199​ print "need to have at least 1 command"
206 sys.exit(1) 200​ sys.exit(1)
207 201​
208 command = args[0] 202​ command = args[0]
Show All 14 Lines
223 elif command == 'init_db': 217​ elif command == 'init_db':
224 initialize_db() 218​ initialize_db()
225 elif command == 'add_milestone': 219​ elif command == 'add_milestone':
226 add_milestone(options.release, options.milestone, options.blocker, 220​ add_milestone(options.release, options.milestone, options.blocker,
227 options.fe) 221​ options.fe)
228 elif command == 'add_release': 222​ elif command == 'add_release':
229 add_release(options.release) 223​ add_release(options.release)
230 elif command == 'generate_config': 224​ elif command == 'generate_config':
231 generate_config(dburi=options.dburi, bugzilla_cookie=options.bzcookie) 225​ generate_config(dburi=options.dburi)
232 elif command == 'minify': 226​ elif command == 'minify':
233 minify() 227​ minify()
234 228​
235 229​
236if __name__ == '__main__': 230​if __name__ == '__main__':
237 exit = main() 231​ exit = main()
238 if exit: 232​ if exit:
239 sys.exit(exit) 233​ sys.exit(exit)
240 234​
View Options

blockerbugs/config.py

Show All 25 Lines24class Config(object):
26 SQLALCHEMY_DATABASE_URI = 'sqlite://' 26​ SQLALCHEMY_DATABASE_URI = 'sqlite://'
27 BUGZILLA_URL = 'https://partner-bugzilla.redhat.com/' 27​ BUGZILLA_URL = 'https://partner-bugzilla.redhat.com/'
28 BUGZILLA_XMLRPC = BUGZILLA_URL + 'xmlrpc.cgi' 28​ BUGZILLA_XMLRPC = BUGZILLA_URL + 'xmlrpc.cgi'
29 KOJI_URL = 'http://koji.stg.fedoraproject.org/' 29​ KOJI_URL = 'http://koji.stg.fedoraproject.org/'
30 FAS_ADMIN_GROUP = 'qa-admin' 30​ FAS_ADMIN_GROUP = 'qa-admin'
31 FAS_HTTPS_REQUIRED = False 31​ FAS_HTTPS_REQUIRED = False
32 FAS_CHECK_CERT = False 32​ FAS_CHECK_CERT = False
33 FAS_BASE_URL = 'https://admin.stg.fedoraproject.org/accounts/' 33​ FAS_BASE_URL = 'https://admin.stg.fedoraproject.org/accounts/'
34 BUGZILLA_COOKIE = '.bugzillacookies' ​
35 LOGFILE = '/var/log/blockerbugs/blockerbugs.log' 34​ LOGFILE = '/var/log/blockerbugs/blockerbugs.log'
36 FILE_LOGGING = False 35​ FILE_LOGGING = False
37 SYSLOG_LOGGING = False 36​ SYSLOG_LOGGING = False
38 STREAM_LOGGING = True 37​ STREAM_LOGGING = True
39 PRODUCTION = False 38​ PRODUCTION = False
40 39​
41 40​
42class ProductionConfig(Config): 41​class ProductionConfig(Config):
43 DEBUG = False 42​ DEBUG = False
44 BUGZILLA_URL = 'https://bugzilla.redhat.com/' 43​ BUGZILLA_URL = 'https://bugzilla.redhat.com/'
45 BUGZILLA_XMLRPC = BUGZILLA_URL + 'xmlrpc.cgi' 44​ BUGZILLA_XMLRPC = BUGZILLA_URL + 'xmlrpc.cgi'
46 BUGZILLA_COOKIE = '/var/www/blockerbugs/bugzillacookie' ​
47 KOJI_URL = 'http://koji.fedoraproject.org/' 45​ KOJI_URL = 'http://koji.fedoraproject.org/'
48 FAS_HTTPS_REQUIRED = True 46​ FAS_HTTPS_REQUIRED = True
49 FAS_BASE_URL = 'https://admin.fedoraproject.org/accounts/' 47​ FAS_BASE_URL = 'https://admin.fedoraproject.org/accounts/'
50 PRODUCTION = True 48​ PRODUCTION = True
51 49​
52 50​
53class DevelopmentConfig(Config): 51​class DevelopmentConfig(Config):
54 TRAP_BAD_REQUEST_ERRORS = True 52​ TRAP_BAD_REQUEST_ERRORS = True
55 SQLALCHEMY_DATABASE_URI = 'sqlite:////tmp/blockerbugs_db.sqlite' 53​ SQLALCHEMY_DATABASE_URI = 'sqlite:////tmp/blockerbugs_db.sqlite'
56 54​
57 55​
58class TestingConfig(Config): 56​class TestingConfig(Config):
59 TESTING = True 57​ TESTING = True
60 58​
View Options

blockerbugs/controllers/main.py

Show First 20 Lines • Show All 301 Lines • ▼ Show 20 Line(s)
302 302​
303def get_bugzilla(): 303​def get_bugzilla():
304 # create bz interface object using the app's config settings 304​ # create bz interface object using the app's config settings
305 if not app.testing: 305​ if not app.testing:
306 if 'FAS_USER' in app.config: 306​ if 'FAS_USER' in app.config:
307 307​
308 app.logger.debug('logging into bugzilla (%s) as %s' % (app.config['BUGZILLA_XMLRPC'], app.config['FAS_USER'])) 308​ app.logger.debug('logging into bugzilla (%s) as %s' % (app.config['BUGZILLA_XMLRPC'], app.config['FAS_USER']))
309 309​
310 return bugzilla.RHBugzilla4(url = app.config['BUGZILLA_XMLRPC'], 310​ return bugzilla.RHBugzilla4(url=app.config['BUGZILLA_XMLRPC'],
311 user = app.config['FAS_USER'], 311​ user=app.config['FAS_USER'],
312 password = app.config['FAS_PASSWORD'], 312​ password=app.config['FAS_PASSWORD'],
313 cookiefile = None) 313​ cookiefile=None)
314 else: 314​ else:
315 app.logger.warning('No FAS_USER configured. bugzilla modifications will NOT work!') 315​ app.logger.warning('No FAS_USER configured. bugzilla modifications will NOT work!')
316 return bugzilla.RHBugzilla4(url=app.config['BUGZILLA_XMLRPC']) 316​ return bugzilla.RHBugzilla4(url=app.config['BUGZILLA_XMLRPC'], cookiefile=None)
317 else: 317​ else:
318 app.logger.error('Bugzilla connections with test configuration is not supported!') 318​ app.logger.error('Bugzilla connections with test configuration is not supported!')
319 return None 319​ return None
320 320​
321 321​
322def check_bz_user(user, password): 322​def check_bz_user(user, password):
323 bz = bugzilla.RHBugzilla4(url=app.config['BUGZILLA_XMLRPC'], cookiefile=None) 323​ bz = bugzilla.RHBugzilla4(url=app.config['BUGZILLA_XMLRPC'], cookiefile=None)
324 if not bz or not bz.login(user, password): 324​ if not bz or not bz.login(user, password):
▲ Show 20 Lines • Show All 102 Lines • Show Last 20 Lines
View Options

blockerbugs/util/bz_interface.py

Show All 40 Lines
41 41​
42class BlockerBugs(): 42​class BlockerBugs():
43 def __init__(self, user=None, password=None, url=None, bz=None, logger=None): 43​ def __init__(self, user=None, password=None, url=None, bz=None, logger=None):
44 self.logger = logger if logger else logging.getLogger('bz_interface') 44​ self.logger = logger if logger else logging.getLogger('bz_interface')
45 if not bz: 45​ if not bz:
46 if not url: 46​ if not url:
47 url = 'https://bugzilla.redhat.com/xmlrpc.cgi' 47​ url = 'https://bugzilla.redhat.com/xmlrpc.cgi'
48 if not (user and password): 48​ if not (user and password):
49 self.bz = bugzilla.RHBugzilla4(url=url) 49​ self.bz = bugzilla.RHBugzilla4(url=url, cookiefile=None)
50 else: 50​ else:
51 self.bz = bugzilla.RHBugzilla4(url=url, 51​ self.bz = bugzilla.RHBugzilla4(url=url,
52 user=user, 52​ user=user,
53 password=password) 53​ password=password,
54​ cookiefile=None)
54 else: 55​ else:
55 self.bz = bz 56​ self.bz = bz
56 self.logger.info('Using bugzilla URL: %s' % url) 57​ self.logger.info('Using bugzilla URL: %s' % url)
57 #https://partner-bugzilla.redhat.com/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED 58​ #https://partner-bugzilla.redhat.com/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED
58 #&bug_status=POST&bug_status=MODIFIED&classification=Fedora&component=anaconda&f1=component&o1=changedafter&product=Fedora&query_format=advanced&v1=2013-03-21%2012%3A25&version=19 59​ #&bug_status=POST&bug_status=MODIFIED&classification=Fedora&component=anaconda&f1=component&o1=changedafter&product=Fedora&query_format=advanced&v1=2013-03-21%2012%3A25&version=19
59 def get_bz_query(self, tracker, last_update=None): 60​ def get_bz_query(self, tracker, last_update=None):
60 query = {} 61​ query = {}
61 query.update(base_query) 62​ query.update(base_query)
▲ Show 20 Lines • Show All 170 Lines • Show Last 20 Lines
View Options

docs/source/blockerbugscli.rst

Show First 20 Lines • Show All 103 Lines • ▼ Show 20 Line(s)
104 104​
105The blocker tracking bugid for a milestone 105​The blocker tracking bugid for a milestone
106 106​
107-a, --accepted 107​-a, --accepted
108^^^^^^^^^^^^^^ 108​^^^^^^^^^^^^^^
109 109​
110The FE tracking bugid for a milestone 110​The FE tracking bugid for a milestone
111 111​
112-z, --bzcookie ​
113^^^^^^^^^^^^^^ ​
114 ​
115Location of bugzilla cookie to use. This should not be used outside of development ​
116environments as it causes problems when used with a non-regular user account. ​
117 ​
118 112​