Changeset 66bb590 for fedd/access_to_abac.py

Timestamp:

Dec 10, 2010 9:03:35 AM (13 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master

Children:

52b6ebc

Parents:

913dc7a (diff), 8d5394e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of tardis.deterlab.net:/var/local/git/fedd

File:

• fedd/access_to_abac.py (modified) (4 diffs)

fedd/access_to_abac.py

@@ -12 +12 @@
 from federation.fedid import fedid
 from federation.authorizer import abac_authorizer
-from federation.util import abac_split_cert, abac_pem_type
+from federation.util import abac_split_cert, abac_pem_type, file_expanding_opts
 
 
@@ -224 +224 @@
 
 
-class access_opts(OptionParser):
+class access_opts(file_expanding_opts):
     '''
     Parse the options for this program.  Most are straightforward, but the
@@ -247 +247 @@
 
     def __init__(self):
-        OptionParser.__init__(self, usage='%prog [opts] file [...]')
+        file_expanding_opts.__init__(self, usage='%prog [opts] file [...]')
         self.add_option('--cert', dest='cert', default=None,
+                type='str', action='callback', callback=self.expand_file,
                 help='my fedid as an X.509 certificate')
         self.add_option('--key', dest='key', default=None,
+                type='str', action='callback', callback=self.expand_file,
                 help='key for the certificate')
         self.add_option('--dir', dest='dir', default=None,
+                type='str', action='callback', callback=self.expand_file,
                 help='Output directory for credentials')
         self.add_option('--type', action='callback', nargs=1, type='str',
@@ -263 +266 @@
                 default=False,
                 help='Do not print credential to local attribute map')
-        self.add_option('--create-creds', action='store_true', 
+        self.add_option('--create_creds', action='store_true', 
                 dest='create_creds', default=False,
                 help='create credentials for rules.  Requires ' + \
                         '--cert, --key, and --dir to be given.')
         self.add_option('--file', dest='file', default=None,
+                type='str', action='callback', callback=self.expand_file,
                 help='Access DB to parse.  If this is present, ' + \
                         'omit the positional filename')
         self.add_option('--mapfile', dest='map', default=None,
+                type='str', action='callback', callback=self.expand_file,
                 help='File for the attribute to local authorization data')
         self.add_option('--no-delegate', action='store_false', dest='delegate',