X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfatables%2Fsfatables;h=0693020d380c5d64a0533cd5cb52e55a3b7558aa;hb=87121ca63d2b95bb155ea2adc5fd7c61d5cddcbe;hp=977153ec4ad96b452285e6ecf22a28687e3e7e83;hpb=aab206b1b50c439c1697c2bbcfd9e540a6c416cd;p=sfa.git

diff --git a/sfatables/sfatables b/sfatables/sfatables
index 977153ec..0693020d 100755
--- a/sfatables/sfatables
+++ b/sfatables/sfatables
@@ -1,37 +1,42 @@
 #!/usr/bin/python 
-# SFAtables is a tool for restricting access to an SFA aggregate in a generic
-# and extensible way. 
 
-# It is modeled using abstractions in iptables. Specifically, 'matches' specify
-# criteria for matching certain requests, 'targets' specify actions that treat
-# requests in a certain way, and 'chains' are used to group related
-# match-action pairs.
+# This file parses an sfatables command and generates XML files that parameterize
+# matches and targets. Each such XML file defines a rule. Rules are dropped in directories
+# that represent 'chains.' SFA loads rules from various chains and invokes them at certain
+# 'hook points.' For example, it invokes rules in the 'OUTGOING' chain before returning
+# the output of 'get_resources.'
 
 import sys
 import os
 import pdb
+import glob
 import libxml2
-from optparse import OptionParser
 
-from sfatables import commands, matches, targets
-from sfatables import Xmlextension
+from optparse import OptionParser
+from sfatables import commands
+from sfatables.xmlextension import Xmlextension
+from sfatables.globals import *
 
 def load_commands(module, list):
-    ext_dict={}
+    command_dict={}
 
     for command_name in list:
         command_module = __import__(".".join([module,command_name]),fromlist=[module])
         command = getattr(command_module, command_name)
         command_dict[command_name]=command()
 
-    return ext_dict
+    return command_dict
 
-def load_xml_extensions(module, list):
+def load_xml_extensions(module, ext_dir):
     ext_dict={}
 
-    for ext_name in list:
-        module = Xmlextension(ext_name)
+    exts = glob.glob(ext_dir + os.path.sep + "*")
+    for ext in exts:
+        module = Xmlextension(ext)
+        # get the filename and get rid of the ".xml" extension
+        ext_name = os.path.extsep.join(os.path.splitext(os.path.basename(ext))[:-1])
         ext_dict[ext_name]=module
+        print "Loaded:", ext_name, ext
 
     return ext_dict
 
@@ -47,14 +52,14 @@ def create_parser(command_dict):
 
     return parser
 
-def xml_ext_create_parser(ext_dict):
+def create_parser_xml_ext(ext_dict):
     parser = OptionParser(usage="sfatables [command] [chain] [match] [target]",
                              description='See "man sfatables" for more detail.')
     
-    for k in command_dict.keys():
-        command = command_dict[k]
+    for k in ext_dict.keys():
+        command = ext_dict[k]
         for arg in command.arguments:
-            parser.add_option(None,"--"+arg,dest=arg,help=command.help,metavar=command.operand)
+            parser.add_option('',"--"+arg['name'],dest=arg['name'],help=arg['help'],metavar=arg['target'])
 
     return parser
 
@@ -74,31 +79,57 @@ def partition(sep, lst):
 
 
 def main():
-    # Segment command line into three blobs, one each for the command, match and target respectively.
-    
+    # sfatables <command> -- <match> -- <target>
     pargs = partition('--', sys.argv[1:])
 
     command_dict = load_commands("sfatables.commands",commands.all)
     command_parser = create_parser(command_dict)
-    (options, args) = command_parser.parse_args()
+    (options, args) = command_parser.parse_args(pargs[0])
+    setattr(options, 'args', args)
 
     command = command_dict[options.command]
 
     if (command.matches):
         if (len(pargs)<2):
             raise Exception("Must specify match for this command")
-        match_dict = load_xml_extensions("sfatables.matches",matches.all)
-        match_parser = create_parser(match_dict)
+        match_dict = load_xml_extensions("sfatables.matches",match_dir)
+        match_parser = create_parser_xml_ext(match_dict)
+        matches_str = ",".join(match_dict.keys())
+        match_parser.add_option('-m','--match',dest='name',help='Match name (one of %s)'%matches_str, metavar = 'MATCH')
+        match_parser.add_option('-n','--negate',dest='negate',help='Negate result',action='store_true')
         (match_options, args) = match_parser.parse_args(pargs[1])
+        try:
+            name = match_options.name
+        except Exception:
+            print "Must specify match name with -m"
+
+        if (match_dict.has_key(name)):
+            setattr(match_options, 'arguments', match_dict[name].arguments)
+        else:
+            raise Exception('Match %s not found'%name)
+
     else:
         match_options=None
 
     if (command.targets):
         if (len(pargs)<3):
             raise Exception("Must specify a target for this command")
-        match_dict = load_xml_extensions("sfatables.targets",targets.all)
-        target_parser = create_parser(match_dict)
+        target_dict = load_xml_extensions("sfatables.targets",target_dir)
+        target_parser = create_parser_xml_ext(target_dict)
+        targets_str = ",".join(target_dict.keys())
+        target_parser.add_option('-j','--jump',dest='name',help='Target name (one of %s)'%targets_str, metavar = 'TARGET')
+        target_parser.add_option('-e','--element',dest='element',help='Element name', metavar = 'ELEMENT')
         (target_options, args) = target_parser.parse_args(pargs[2])
+        try:
+            name = target_options.name
+        except Exception:
+            print "Must specify target name with -j"
+
+        if (target_dict.has_key(name)):
+            setattr(target_options, 'arguments', target_dict[name].arguments)
+        else:
+            raise Exception('Target %s not found'%name)
+
     else:
         target_options = None