chpwd, operation.py: Allow administrative override of policy.

diff --git a/chpwd b/chpwd
index 0e0de39357555ec73b41b39422e8dc3f5dfc91e8..2d6c75c8c32d2025057fb5715da74f87c171fccf 100755 (executable)
--- a/chpwd
+++ b/chpwd
@@ -76,6 +76,9 @@ for short, long, props in [
     'default': ENV.get('CHPWD_CONFIG',
                        OS.path.join(HOME, 'chpwd.conf')),
     'help': 'read configuration from FILE.' }),
     'default': ENV.get('CHPWD_CONFIG',
                        OS.path.join(HOME, 'chpwd.conf')),
     'help': 'read configuration from FILE.' }),

+  ('-i', '--ignore-policy', {
+    'dest': 'ignpol', 'default': False, 'action': 'store_true',
+    'help': 'ignore the operation policy (for administrators)' }),

   ('-s', '--ssl', {
     'dest': 'sslp', 'action': 'store_true',
     'help': 'pretend CGI connection is carried over SSL/TLS' }),
   ('-s', '--ssl', {
     'dest': 'sslp', 'action': 'store_true',
     'help': 'pretend CGI connection is carried over SSL/TLS' }),

diff --git a/operation.py b/operation.py
index bf17b05778b5d54cb20b746adce529b7c7d71dd9..fccd172fc908ee5b7b9fa0895e735e8eb5d913fa 100644 (file)
--- a/operation.py
+++ b/operation.py
@@ -343,14 +343,15 @@ def operate(op, accts, *args, **kw):
   """
   rq = getattr(CFG.RQCLASS, op)(accts, *args, **kw)
   desc = rq.describe()
   """
   rq = getattr(CFG.RQCLASS, op)(accts, *args, **kw)
   desc = rq.describe()

-  try:
-    rq.check()
-  except U.ExpectedError, e:
-    L.syslog('REFUSE %s %s: %s' %
-             (desc,
-              ', '.join(['%s@%s' % (o.user, o.svc.name) for o in rq.ops]),
-              e))
-    raise
+  if not CFG.OPTS.ignpol:
+    try:
+      rq.check()
+    except U.ExpectedError, e:
+      L.syslog('REFUSE %s %s: %s' %
+               (desc,
+                ', '.join(['%s@%s' % (o.user, o.svc.name) for o in rq.ops]),
+                e))
+      raise

   ops = rq.perform()
   nwin = nlose = 0
   for o in ops:
   ops = rq.perform()
   nwin = nlose = 0
   for o in ops: