Changeset 0a49bd7 for fedd/access_to_abac.py

Timestamp:

Jan 15, 2011 5:52:15 PM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master

Children:

aaf7f41

Parents:

ac15159 (diff), 944b746 (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.

git-author:

Ted Faber <faber@…> (01/15/11 17:51:40)

git-committer:

Ted Faber <faber@…> (01/15/11 17:52:15)

Message:

merge from current

File:

• fedd/access_to_abac.py (modified) (7 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
 
 
@@ -185 +185 @@
 
 
-def parse_access(fn, mapper):
+def parse_access(fn, mapper, delegation_link):
     """
     Parse the access file, calling out to the mapper to parse specific
@@ -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', 
-                dest='create_creds', default=False,
-                help='create credentials for rules.  Requires ' + \
-                        '--cert, --key, and --dir to be given.')
+        self.add_option('--no_create_creds', action='store_false', 
+                dest='create_creds', default=True,
+                help='Do not create credentials for rules.')
         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',
@@ -276 +280 @@
                 help='do not accept delegated attributes with the ' +\
                         'acting_for linking role')
-        self.add_option('--auth', action='store_true', dest='create_auth', 
-                default=False, help='create a full ABAC authorizer')
+        self.add_option('--no_auth', action='store_false', dest='create_auth', 
+                default=True, help='do not create a full ABAC authorizer')
         self.add_option('--debug', action='store_true', dest='debug', 
                 default=False, help='Just print actions')
@@ -402 +406 @@
     for fn in args:
         try:
-            creds, to_id = parse_access(fn, opts.mapper)
+            creds, to_id = parse_access(fn, opts.mapper, delegation_link)
         except parse_error, e:
             print >> sys.stderr, "%s" % e