1 |
commit: 51f847f29ddfb4af33df09eb495781850bdcb293 |
2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Dec 30 19:06:19 2014 +0000 |
4 |
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jan 1 02:39:37 2015 +0000 |
6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/gentoo-keys.git;a=commit;h=51f847f2 |
7 |
|
8 |
gkeys: Remove the need to import gkeys seed.py and lib.py |
9 |
|
10 |
Pass in the logger to GkeysGPG initialization. |
11 |
Pass in logger to Seeds class initialization. |
12 |
This removes the need to import and set the logger in base.py. |
13 |
It can then be used in gkeys-gen and gkeys-ldap without those imports. |
14 |
Remove no longer needed imports. |
15 |
|
16 |
--- |
17 |
gkeys/gkeys/actions.py | 16 ++++----- |
18 |
gkeys/gkeys/base.py | 26 +++++++-------- |
19 |
gkeys/gkeys/lib.py | 82 +++++++++++++++++++++++----------------------- |
20 |
gkeys/gkeys/seed.py | 23 ++++++------- |
21 |
gkeys/gkeys/seedhandler.py | 4 +-- |
22 |
5 files changed, 75 insertions(+), 76 deletions(-) |
23 |
|
24 |
diff --git a/gkeys/gkeys/actions.py b/gkeys/gkeys/actions.py |
25 |
index 9b44cc8..7682dd2 100644 |
26 |
--- a/gkeys/gkeys/actions.py |
27 |
+++ b/gkeys/gkeys/actions.py |
28 |
@@ -243,7 +243,7 @@ class Actions(object): |
29 |
keyring = self.config.get_key('keyring') |
30 |
catdir = os.path.join(keyring, args.category) |
31 |
self.logger.debug("ACTIONS: listkey; catdir = %s" % catdir) |
32 |
- self.gpg = GkeysGPG(self.config, catdir) |
33 |
+ self.gpg = GkeysGPG(self.config, catdir, self.logger) |
34 |
handler = SeedHandler(self.logger, self.config) |
35 |
if args.keydir: |
36 |
self.gpg.set_keydir(args.keydir, "list-keys") |
37 |
@@ -338,7 +338,7 @@ class Actions(object): |
38 |
keyring = self.config.get_key('keyring') |
39 |
catdir = os.path.join(keyring, args.category) |
40 |
self.logger.debug("ACTIONS: installkey; catdir = %s" % catdir) |
41 |
- self.gpg = GkeysGPG(self.config, catdir) |
42 |
+ self.gpg = GkeysGPG(self.config, catdir, self.logger) |
43 |
results = {} |
44 |
failed = [] |
45 |
for key in gkey: |
46 |
@@ -374,7 +374,7 @@ class Actions(object): |
47 |
keyring = self.config.get_key('keyring') |
48 |
catdir = os.path.join(keyring, args.category) |
49 |
self.logger.debug("ACTIONS: checkkey; catdir = %s" % catdir) |
50 |
- self.gpg = GkeysGPG(self.config, catdir) |
51 |
+ self.gpg = GkeysGPG(self.config, catdir, self.logger) |
52 |
results = {} |
53 |
failed = defaultdict(list) |
54 |
kwargs = handler.build_gkeydict(args) |
55 |
@@ -422,7 +422,7 @@ class Actions(object): |
56 |
keyring = self.config.get_key('keyring') |
57 |
catdir = os.path.join(keyring, args.category) |
58 |
self.logger.debug("ACTIONS: speccheck; catdir = %s" % catdir) |
59 |
- self.gpg = GkeysGPG(self.config, catdir) |
60 |
+ self.gpg = GkeysGPG(self.config, catdir, self.logger) |
61 |
results = {} |
62 |
failed = defaultdict(list) |
63 |
kwargs = handler.build_gkeydict(args) |
64 |
@@ -588,7 +588,7 @@ class Actions(object): |
65 |
catdir = os.path.join(keyring, args.category) |
66 |
keyring_dir = self.config.get_key("keyring") |
67 |
self.logger.debug("ACTIONS: importkey; catdir = %s" % catdir) |
68 |
- self.gpg = GkeysGPG(self.config, catdir) |
69 |
+ self.gpg = GkeysGPG(self.config, catdir, self.logger) |
70 |
success, gkeys = self.listseed(args)[1] |
71 |
results = {} |
72 |
failed = [] |
73 |
@@ -692,7 +692,7 @@ class Actions(object): |
74 |
keyrings = self.config.get_key('keyring') |
75 |
catdir = os.path.join(keyrings, args.category) |
76 |
self.logger.debug("ACTIONS: verify; catdir = %s" % catdir) |
77 |
- self.gpg = GkeysGPG(self.config, catdir) |
78 |
+ self.gpg = GkeysGPG(self.config, catdir, self.logger) |
79 |
return self._verify(args, handler, key, messages) |
80 |
|
81 |
|
82 |
@@ -827,7 +827,7 @@ class Actions(object): |
83 |
|
84 |
self.logger.debug("ACTIONS: sign; keydir = %s" % keydir) |
85 |
|
86 |
- self.gpg = GkeysGPG(self.config, basedir) |
87 |
+ self.gpg = GkeysGPG(self.config, basedir, self.logger) |
88 |
self.gpg.set_keydir(keydir, task) |
89 |
if keyring not in ['', None]: |
90 |
self.gpg.set_keyring(keyring, task) |
91 |
@@ -862,7 +862,7 @@ class Actions(object): |
92 |
keyring = self.config.get_key('keyring') |
93 |
catdir = os.path.join(keyring, args.category) |
94 |
self.logger.debug("ACTIONS: refreshkey; catdir = %s" % catdir) |
95 |
- self.gpg = GkeysGPG(self.config, catdir) |
96 |
+ self.gpg = GkeysGPG(self.config, catdir, self.logger) |
97 |
results = {} |
98 |
kwargs = handler.build_gkeydict(args) |
99 |
keyresults = seeds.list(**kwargs) |
100 |
|
101 |
diff --git a/gkeys/gkeys/base.py b/gkeys/gkeys/base.py |
102 |
index c9faf0e..d03efc4 100644 |
103 |
--- a/gkeys/gkeys/base.py |
104 |
+++ b/gkeys/gkeys/base.py |
105 |
@@ -17,7 +17,7 @@ from __future__ import print_function |
106 |
import argparse |
107 |
import sys |
108 |
|
109 |
-from gkeys import fileops, seed, lib |
110 |
+from gkeys import fileops |
111 |
from gkeys.log import log_levels, set_logger |
112 |
|
113 |
|
114 |
@@ -43,6 +43,7 @@ class CliBase(object): |
115 |
self.args = None |
116 |
self.seeds = None |
117 |
self.actions = None |
118 |
+ self.logger = None |
119 |
|
120 |
|
121 |
@staticmethod |
122 |
@@ -190,7 +191,7 @@ class CliBase(object): |
123 |
@param args: list |
124 |
@returns argparse.Namespace object |
125 |
''' |
126 |
- #logger.debug('CliBase: parse_args; args: %s' % args) |
127 |
+ #self.logger.debug('CliBase: parse_args; args: %s' % args) |
128 |
parser = argparse.ArgumentParser( |
129 |
prog=self.cli_config['prog'], |
130 |
description=self.cli_config['description'], |
131 |
@@ -245,7 +246,6 @@ class CliBase(object): |
132 |
|
133 |
@param args: list or argparse.Namespace object |
134 |
''' |
135 |
- global logger |
136 |
message = None |
137 |
if not args: |
138 |
message = "Main: run; invalid args argument passed in" |
139 |
@@ -257,20 +257,18 @@ class CliBase(object): |
140 |
self.config.read_config() |
141 |
|
142 |
# establish our logger and update it in the imported files |
143 |
- logger = set_logger(self.cli_config['prog'], self.config['logdir'], args.debug, |
144 |
+ self.logger = set_logger(self.cli_config['prog'], self.config['logdir'], args.debug, |
145 |
dirmode=int(self.config.get_key('permissions', 'directories'),0), |
146 |
filemask=int(self.config.get_key('permissions', 'files'),0)) |
147 |
- self.config.logger = logger |
148 |
- fileops.logger = logger |
149 |
- seed.logger = logger |
150 |
- lib.logger = logger |
151 |
+ self.config.logger = self.logger |
152 |
+ fileops.logger = self.logger |
153 |
|
154 |
if message: |
155 |
- logger.error(message) |
156 |
+ self.logger.error(message) |
157 |
|
158 |
# now that we have a logger, record the alternate config setting |
159 |
if args.config: |
160 |
- logger.debug("Main: run; Found alternate config request: %s" |
161 |
+ self.logger.debug("Main: run; Found alternate config request: %s" |
162 |
% args.config) |
163 |
|
164 |
# check if a -C, --category was input |
165 |
@@ -282,12 +280,12 @@ class CliBase(object): |
166 |
return False |
167 |
|
168 |
# establish our actions instance |
169 |
- self.actions = self.cli_config['Actions'](self.config, self.output_results, logger) |
170 |
+ self.actions = self.cli_config['Actions'](self.config, self.output_results, self.logger) |
171 |
|
172 |
# run the action |
173 |
func = getattr(self.actions, '%s' |
174 |
% self.cli_config['Action_Map'][args.action]) |
175 |
- logger.debug('Main: run; Found action: %s' % args.action) |
176 |
+ self.logger.debug('Main: run; Found action: %s' % args.action) |
177 |
success, results = func(args) |
178 |
if not results: |
179 |
print("No results found. Check your configuration and that the", |
180 |
@@ -328,7 +326,7 @@ class CliBase(object): |
181 |
''' |
182 |
available_cats = list(self.config.defaults['seeds']) |
183 |
if category and category not in available_cats: |
184 |
- self.config.logger.error("Invalid category or seedfile entered: %s" % category) |
185 |
- self.config.logger.error("Available categories or seedfiles: %s" % ', '.join(sorted(available_cats))) |
186 |
+ self.logger.error("Invalid category or seedfile entered: %s" % category) |
187 |
+ self.logger.error("Available categories or seedfiles: %s" % ', '.join(sorted(available_cats))) |
188 |
return False |
189 |
return True |
190 |
|
191 |
diff --git a/gkeys/gkeys/lib.py b/gkeys/gkeys/lib.py |
192 |
index 724abfc..6bb3d5b 100644 |
193 |
--- a/gkeys/gkeys/lib.py |
194 |
+++ b/gkeys/gkeys/lib.py |
195 |
@@ -26,14 +26,13 @@ from os.path import join as pjoin |
196 |
from pyGPG.gpg import GPG |
197 |
from gkeys.checks import KeyChecks |
198 |
from gkeys.fileops import ensure_dirs |
199 |
-from gkeys.log import logger |
200 |
from gkeys.seed import Seeds |
201 |
|
202 |
class GkeysGPG(GPG): |
203 |
'''Gentoo-keys primary gpg class''' |
204 |
|
205 |
|
206 |
- def __init__(self, config, basedir): |
207 |
+ def __init__(self, config, basedir, logger): |
208 |
'''class init function |
209 |
|
210 |
@param config: GKeysConfig config instance to use |
211 |
@@ -43,6 +42,7 @@ class GkeysGPG(GPG): |
212 |
GPG.__init__(self, config, logger) |
213 |
self.config = config |
214 |
self.basedir = basedir |
215 |
+ self.logger = logger |
216 |
self.keydir = None |
217 |
self.server = None |
218 |
|
219 |
@@ -54,10 +54,10 @@ class GkeysGPG(GPG): |
220 |
return |
221 |
self.server = server or self.config['keyserver'] |
222 |
self.config.options['gpg_defaults'] = self.config.defaults['gpg_defaults'][:] |
223 |
- logger.debug("keyserver: %s" % (self.server)) |
224 |
+ self.logger.debug("keyserver: %s" % (self.server)) |
225 |
server_value = ['--keyserver', self.server] |
226 |
self.config.options['gpg_defaults'].extend(server_value) |
227 |
- logger.debug("self.config.options['gpg_defaults']: %s" |
228 |
+ self.logger.debug("self.config.options['gpg_defaults']: %s" |
229 |
% (self.config.options['gpg_defaults'])) |
230 |
return |
231 |
|
232 |
@@ -65,7 +65,7 @@ class GkeysGPG(GPG): |
233 |
def set_keyring(self, keyring, task, importkey=False, reset=True): |
234 |
'''Sets the keyring to use as well as related task options |
235 |
''' |
236 |
- logger.debug("keydir: %s, keyring: %s" % (self.keydir, keyring)) |
237 |
+ self.logger.debug("keydir: %s, keyring: %s" % (self.keydir, keyring)) |
238 |
if reset: |
239 |
self.config.options['tasks'][task] = self.config.defaults['tasks'][task][:] |
240 |
# --keyring file | Note that this adds a keyring to the current list. |
241 |
@@ -79,12 +79,12 @@ class GkeysGPG(GPG): |
242 |
mode=int(self.config.get_key('permissions', 'directories'),0)) |
243 |
task_value = ['--no-default-keyring', '--keyring', keyring] |
244 |
self.config.options['tasks'][task].extend(task_value) |
245 |
- logger.debug("set_keyring: New task options: %s" %str(self.config.options['tasks'][task])) |
246 |
+ self.logger.debug("set_keyring: New task options: %s" %str(self.config.options['tasks'][task])) |
247 |
return |
248 |
|
249 |
|
250 |
def set_keydir(self, keydir, task, fingerprint=True, reset=True): |
251 |
- logger.debug("basedir: %s, keydir: %s" % (self.basedir, keydir)) |
252 |
+ self.logger.debug("basedir: %s, keydir: %s" % (self.basedir, keydir)) |
253 |
self.keydir = pjoin(self.basedir, keydir) |
254 |
self.task = task |
255 |
if reset: |
256 |
@@ -94,7 +94,7 @@ class GkeysGPG(GPG): |
257 |
task_value.append('--fingerprint') |
258 |
task_value.extend(['--homedir', self.keydir]) |
259 |
self.config.options['tasks'][task].extend(task_value) |
260 |
- logger.debug("set_keydir: New task options: %s" %str(self.config.options['tasks'][task])) |
261 |
+ self.logger.debug("set_keydir: New task options: %s" %str(self.config.options['tasks'][task])) |
262 |
return |
263 |
|
264 |
|
265 |
@@ -109,13 +109,13 @@ class GkeysGPG(GPG): |
266 |
self.set_keydir(keydir, 'import', reset=True) |
267 |
self.set_keyring(keyring, 'import', importkey=True, reset=False) |
268 |
results = [] |
269 |
- logger.debug("LIB: import_to_keyring; name: " + gkey.name) |
270 |
- logger.debug("** Calling runGPG with Running: gpg %s --import' for: %s" |
271 |
+ self.logger.debug("LIB: import_to_keyring; name: " + gkey.name) |
272 |
+ self.logger.debug("** Calling runGPG with Running: gpg %s --import' for: %s" |
273 |
% (' '.join(self.config.get_key('tasks', 'import')), |
274 |
gkey.name)) |
275 |
pubring_path = pjoin(self.keydir, gkey.keydir, 'pubring.gpg') |
276 |
result = self.runGPG(task='import', inputfile=pubring_path) |
277 |
- logger.info('GPG return code: ' + str(result.returncode)) |
278 |
+ self.logger.info('GPG return code: ' + str(result.returncode)) |
279 |
results.append(result) |
280 |
print(result.stderr_out) |
281 |
return results |
282 |
@@ -131,32 +131,32 @@ class GkeysGPG(GPG): |
283 |
self.set_keyserver() |
284 |
self.set_keydir(gkey.keydir, 'recv-keys', reset=True) |
285 |
self.set_keyring('pubring.gpg', 'recv-keys', reset=False) |
286 |
- logger.debug("LIB: add_key; ensure dirs: " + self.keydir) |
287 |
+ self.logger.debug("LIB: add_key; ensure dirs: " + self.keydir) |
288 |
mode = int(self.config.get_key('permissions', 'directories'),0) |
289 |
ensure_dirs(str(self.keydir), mode=mode) |
290 |
self.set_keyseedfile(trap_errors=False) |
291 |
results = [] |
292 |
for fingerprint in gkey.fingerprint: |
293 |
- logger.debug("LIB: add_key; adding fingerprint " + fingerprint) |
294 |
- logger.debug("** Calling runGPG with Running 'gpg %s --recv-keys %s' for: %s" |
295 |
+ self.logger.debug("LIB: add_key; adding fingerprint " + fingerprint) |
296 |
+ self.logger.debug("** Calling runGPG with Running 'gpg %s --recv-keys %s' for: %s" |
297 |
% (' '.join(self.config.get_key('tasks', 'recv-keys')), |
298 |
fingerprint, gkey.name)) |
299 |
result = self.runGPG(task='recv-keys', inputfile=fingerprint) |
300 |
- logger.info('GPG return code: ' + str(result.returncode)) |
301 |
+ self.logger.info('GPG return code: ' + str(result.returncode)) |
302 |
if result.fingerprint in gkey.fingerprint: |
303 |
result.failed = False |
304 |
message = "Fingerprints match... Import successful: " |
305 |
message += "%s, fingerprint: %s" % (gkey.nick, fingerprint) |
306 |
message += "\n result len: %s, %s" % (len(result.fingerprint), result.fingerprint) |
307 |
message += "\n gkey len: %s, %s" % (len(gkey.fingerprint[0]), gkey.fingerprint[0]) |
308 |
- logger.info(message) |
309 |
+ self.logger.info(message) |
310 |
else: |
311 |
result.failed = True |
312 |
message = "Fingerprints do not match... Import failed for " |
313 |
message += "%s, fingerprint: %s" % (gkey.nick, fingerprint) |
314 |
message += "\n result: %s" % (result.fingerprint) |
315 |
message += "\n gkey..: %s" % (str(gkey.fingerprint)) |
316 |
- logger.error(message) |
317 |
+ self.logger.error(message) |
318 |
# Save the gkey seed to the installed db |
319 |
success = self.update_gkey(gkey, save=True) |
320 |
if not success: |
321 |
@@ -190,11 +190,11 @@ class GkeysGPG(GPG): |
322 |
self.set_keydir(gkey.keydir, 'refresh-keys', reset=True) |
323 |
self.set_keyring('pubring.gpg', 'refresh-keys', reset=False) |
324 |
self.set_keyseedfile(refresh=True) |
325 |
- logger.debug("LIB: refresh_key, gkey: %s" % str(gkey)) |
326 |
- logger.debug("** Calling runGPG with Running 'gpg %s --refresh-keys' for: %s" |
327 |
+ self.logger.debug("LIB: refresh_key, gkey: %s" % str(gkey)) |
328 |
+ self.logger.debug("** Calling runGPG with Running 'gpg %s --refresh-keys' for: %s" |
329 |
% (' '.join(self.config.get_key('tasks', 'refresh-keys')), str(gkey))) |
330 |
result = self.runGPG(task='refresh-keys', inputfile='') |
331 |
- logger.info('GPG return code: ' + str(result.returncode)) |
332 |
+ self.logger.info('GPG return code: ' + str(result.returncode)) |
333 |
self.update_gkey(gkey, save=True) |
334 |
return result |
335 |
|
336 |
@@ -211,7 +211,7 @@ class GkeysGPG(GPG): |
337 |
lresults.append(self.list_keys(gkey.keydir, fpr, colons=True)) |
338 |
self.seedfile.update(gkey.update(lresults)) |
339 |
if save and not self.seedfile.save(): |
340 |
- logger.error("GkeysGPG.refresh_key(); failed to save seed: " + gkey.nick) |
341 |
+ self.logger.error("GkeysGPG.refresh_key(); failed to save seed: " + gkey.nick) |
342 |
return False |
343 |
return True |
344 |
|
345 |
@@ -225,7 +225,7 @@ class GkeysGPG(GPG): |
346 |
@param colons: bool to enable colon listing |
347 |
''' |
348 |
if not keydir: |
349 |
- logger.debug("LIB: list_keys(), invalid keydir parameter: %s" |
350 |
+ self.logger.debug("LIB: list_keys(), invalid keydir parameter: %s" |
351 |
% str(keydir)) |
352 |
return [] |
353 |
if fingerprint: |
354 |
@@ -239,11 +239,11 @@ class GkeysGPG(GPG): |
355 |
if colons: |
356 |
task_value = ['--with-colons'] |
357 |
self.config.options['tasks'][task].extend(task_value) |
358 |
- logger.debug("** Calling runGPG with Running 'gpg %s --%s %s'" |
359 |
+ self.logger.debug("** Calling runGPG with Running 'gpg %s --%s %s'" |
360 |
% (' '.join(self.config['tasks'][task]), task, keydir) |
361 |
) |
362 |
result = self.runGPG(task=task, inputfile=target) |
363 |
- logger.info('GPG return code: ' + str(result.returncode)) |
364 |
+ self.logger.info('GPG return code: ' + str(result.returncode)) |
365 |
return result |
366 |
|
367 |
|
368 |
@@ -257,7 +257,7 @@ class GkeysGPG(GPG): |
369 |
''' |
370 |
if not result: |
371 |
result = self.list_keys(keydir, fingerprint=keyid, colons=True) |
372 |
- checker = KeyChecks(logger, qualified_id_check=True) |
373 |
+ checker = KeyChecks(self.logger, qualified_id_check=True) |
374 |
return checker.validity_checks(keydir, keyid, result) |
375 |
|
376 |
|
377 |
@@ -272,7 +272,7 @@ class GkeysGPG(GPG): |
378 |
''' |
379 |
if not result: |
380 |
result = self.list_keys(keydir, fingerprint=keyid, colons=True) |
381 |
- checker = KeyChecks(logger, qualified_id_check=True) |
382 |
+ checker = KeyChecks(self.logger, qualified_id_check=True) |
383 |
specchecks = checker.spec_check(keydir, keyid, result) |
384 |
return specchecks |
385 |
|
386 |
@@ -306,29 +306,29 @@ class GkeysGPG(GPG): |
387 |
''' |
388 |
if signature: |
389 |
self.set_keydir(gkey.keydir, 'verify', reset=True) |
390 |
- logger.debug("** Calling runGPG with Running 'gpg %s --verify %s and %s'" |
391 |
+ self.logger.debug("** Calling runGPG with Running 'gpg %s --verify %s and %s'" |
392 |
% (' '.join(self.config['tasks']['verify']), signature, filepath)) |
393 |
results = self.runGPG(task='verify', inputfile=[signature,filepath]) |
394 |
else: |
395 |
self.set_keydir(gkey.keydir, 'decrypt', reset=True) |
396 |
- logger.debug("** Calling runGPG with Running 'gpg %s --decrypt %s and %s'" |
397 |
+ self.logger.debug("** Calling runGPG with Running 'gpg %s --decrypt %s and %s'" |
398 |
% (' '.join(self.config['tasks']['decrypt']), filepath)) |
399 |
results = self.runGPG(task='decrypt', inputfile=filepath) |
400 |
keyid = gkey.keyid[0] |
401 |
if results.verified[0]: |
402 |
- logger.info("GPG verification succeeded. Name: %s / Key: %s" % (gkey.name, keyid)) |
403 |
- logger.info("\tSignature result:" + str(results.verified)) |
404 |
+ self.logger.info("GPG verification succeeded. Name: %s / Key: %s" % (gkey.name, keyid)) |
405 |
+ self.logger.info("\tSignature result:" + str(results.verified)) |
406 |
else: |
407 |
- logger.debug("GPG verification failed. Name: %s / Key: %s" % (gkey.name, keyid)) |
408 |
- logger.debug("\t Signature result:"+ str(results.verified)) |
409 |
- logger.debug("LIB: verify; stderr_out:" + str(results.stderr_out)) |
410 |
+ self.logger.debug("GPG verification failed. Name: %s / Key: %s" % (gkey.name, keyid)) |
411 |
+ self.logger.debug("\t Signature result:"+ str(results.verified)) |
412 |
+ self.logger.debug("LIB: verify; stderr_out:" + str(results.stderr_out)) |
413 |
return results |
414 |
|
415 |
|
416 |
def set_keyseedfile(self, trap_errors=True, refresh=False): |
417 |
if not self.keydir: |
418 |
- logger.debug("GkeysGPG.set_keyseedfile(); self.keydir error") |
419 |
- self.seedfile = Seeds(pjoin(self.keydir, 'gkey.seeds'), self.config) |
420 |
+ self.logger.debug("GkeysGPG.set_keyseedfile(); self.keydir error") |
421 |
+ self.seedfile = Seeds(pjoin(self.keydir, 'gkey.seeds'), self.config, self.logger) |
422 |
self.seedfile.load(trap_errors=trap_errors, refresh=refresh) |
423 |
|
424 |
|
425 |
@@ -342,15 +342,15 @@ class GkeysGPG(GPG): |
426 |
''' |
427 |
keyid = gkey.keyid[0] |
428 |
self.set_keydir(gkey.keydir, mode, reset=True) |
429 |
- logger.debug("** Calling runGPG with Running 'gpg %s --%s %s %s'" |
430 |
+ self.logger.debug("** Calling runGPG with Running 'gpg %s --%s %s %s'" |
431 |
% (' '.join(self.config['tasks'][mode]), mode, fingerprint, filepath)) |
432 |
results = self.runGPG(task=mode, inputfile=filepath) |
433 |
|
434 |
if results.verified[0]: |
435 |
- logger.info("GPG signing succeeded. Name: %s / Key: %s" % (str(gkey.name), str(keyid))) |
436 |
- logger.info("\tSignature result:" + str(results.verified)) |
437 |
+ self.logger.info("GPG signing succeeded. Name: %s / Key: %s" % (str(gkey.name), str(keyid))) |
438 |
+ self.logger.info("\tSignature result:" + str(results.verified)) |
439 |
else: |
440 |
- logger.debug("GPG signing failed. Name: %s / Key: %s" % (str(gkey.name), str(keyid))) |
441 |
- logger.debug("\t Signature result:"+ str(results.verified)) |
442 |
- logger.debug("LIB: sign; stderr_out:" + str(results.stderr_out)) |
443 |
+ self.logger.debug("GPG signing failed. Name: %s / Key: %s" % (str(gkey.name), str(keyid))) |
444 |
+ self.logger.debug("\t Signature result:"+ str(results.verified)) |
445 |
+ self.logger.debug("LIB: sign; stderr_out:" + str(results.stderr_out)) |
446 |
return results |
447 |
|
448 |
diff --git a/gkeys/gkeys/seed.py b/gkeys/gkeys/seed.py |
449 |
index 1a2bae2..15c9e2c 100644 |
450 |
--- a/gkeys/gkeys/seed.py |
451 |
+++ b/gkeys/gkeys/seed.py |
452 |
@@ -29,13 +29,14 @@ class Seeds(object): |
453 |
'''Handles all seed key file operations''' |
454 |
|
455 |
|
456 |
- def __init__(self, filepath=None, config=None): |
457 |
+ def __init__(self, filepath=None, config=None, _logger=None): |
458 |
'''Seeds class init function |
459 |
|
460 |
@param filepath: string of the file to load |
461 |
''' |
462 |
self.filename = filepath |
463 |
self.config = config |
464 |
+ self.logger = _logger or logger |
465 |
self.seeds = {} |
466 |
|
467 |
|
468 |
@@ -44,16 +45,16 @@ class Seeds(object): |
469 |
if filename: |
470 |
self.filename = filename |
471 |
if not self.filename: |
472 |
- logger.debug("Seed: load; Not a valid filename: '%s'" % str(self.filename)) |
473 |
+ self.logger.debug("Seed: load; Not a valid filename: '%s'" % str(self.filename)) |
474 |
return False |
475 |
- logger.debug("Seeds: load; Begin loading seed file %s" % self.filename) |
476 |
+ self.logger.debug("Seeds: load; Begin loading seed file %s" % self.filename) |
477 |
seedlines = None |
478 |
self.seeds = {} |
479 |
try: |
480 |
with open(self.filename, "r+") as seedfile: |
481 |
seedlines = json.load(seedfile) |
482 |
except IOError as err: |
483 |
- logger.debug("Seed: load; IOError occurred while loading file") |
484 |
+ self.logger.debug("Seed: load; IOError occurred while loading file") |
485 |
if trap_errors: |
486 |
self._error(err) |
487 |
return False |
488 |
@@ -71,10 +72,10 @@ class Seeds(object): |
489 |
#try: |
490 |
self.seeds[seed[0]] = GKEY(**seed[1]) |
491 |
#except Exception as err: |
492 |
- #logger.debug("Seed: load; Error splitting seed: %s" % seed) |
493 |
- #logger.debug("Seed: load; ...............parts: %s" % str(parts)) |
494 |
+ #self.logger.debug("Seed: load; Error splitting seed: %s" % seed) |
495 |
+ #self.logger.debug("Seed: load; ...............parts: %s" % str(parts)) |
496 |
#self._error(err) |
497 |
- logger.debug("Seed: load; Completed loading seed file %s" % self.filename) |
498 |
+ self.logger.debug("Seed: load; Completed loading seed file %s" % self.filename) |
499 |
return True |
500 |
|
501 |
|
502 |
@@ -83,9 +84,9 @@ class Seeds(object): |
503 |
if filename: |
504 |
self.filename = filename |
505 |
if not self.filename: |
506 |
- logger.debug("Seed: save; Not a valid filename: '%s'" % str(self.filename)) |
507 |
+ self.logger.debug("Seed: save; Not a valid filename: '%s'" % str(self.filename)) |
508 |
return False |
509 |
- logger.debug("Seed: save; Begin saving seed file %s" % self.filename) |
510 |
+ self.logger.debug("Seed: save; Begin saving seed file %s" % self.filename) |
511 |
ensure_dirs(os.path.split(self.filename)[0], |
512 |
mode=int(self.config.get_key('permissions', "directories"),0), |
513 |
fatal=True) |
514 |
@@ -217,8 +218,8 @@ class Seeds(object): |
515 |
|
516 |
def _error(self, err): |
517 |
'''Class error logging function''' |
518 |
- logger.error("Seed: Error processing seed file %s" % self.filename) |
519 |
- logger.error("Seed: Error was: %s" % str(err)) |
520 |
+ self.logger.error("Seed: Error processing seed file %s" % self.filename) |
521 |
+ self.logger.error("Seed: Error was: %s" % str(err)) |
522 |
|
523 |
|
524 |
def _seeds2json(self, seeds): |
525 |
|
526 |
diff --git a/gkeys/gkeys/seedhandler.py b/gkeys/gkeys/seedhandler.py |
527 |
index 5ddccbe..9540ee0 100644 |
528 |
--- a/gkeys/gkeys/seedhandler.py |
529 |
+++ b/gkeys/gkeys/seedhandler.py |
530 |
@@ -77,7 +77,7 @@ class SeedHandler(object): |
531 |
self.logger.error("SeedHandler: load_seeds; No filepath to load") |
532 |
self.logger.debug("SeedHandler: load_seeds; seeds filepath to load: " |
533 |
"%s" % filepath) |
534 |
- seeds = Seeds(config=self.config) |
535 |
+ seeds = Seeds(config=self.config, _logger=self.logger) |
536 |
seeds.load(filepath, refresh=refresh) |
537 |
self.seeds = seeds |
538 |
return seeds |
539 |
@@ -89,7 +89,7 @@ class SeedHandler(object): |
540 |
@param nicks: list of string nick ids to load |
541 |
@return Seeds class object |
542 |
''' |
543 |
- seeds = Seeds(config=self.config) |
544 |
+ seeds = Seeds(config=self.config, _logger=self.logger) |
545 |
if category == 'sign': |
546 |
catdir = self.config.get_key('sign-keydir') |
547 |
else: |