From 80c4ed7af26b5b6a581ccc8e0a9e65e53e43cc4c Mon Sep 17 00:00:00 2001
From: John Dennis <jdennis@redhat.com>
Date: Tue, 6 Nov 2007 16:26:10 -0500
Subject: remove offensive use of rpm add the radiusprofile to the list of
 objectclasses used when creating a user

---
 ipa-python/ipautil.py | 36 ------------------------------------
 1 file changed, 36 deletions(-)

(limited to 'ipa-python/ipautil.py')

diff --git a/ipa-python/ipautil.py b/ipa-python/ipautil.py
index 96a74d75..e7f59419 100644
--- a/ipa-python/ipautil.py
+++ b/ipa-python/ipautil.py
@@ -30,7 +30,6 @@ from string import lower
 import re
 import xmlrpclib
 import datetime
-import rpm
 
 def realm_to_suffix(realm_name):
     s = realm_name.split(".")
@@ -332,38 +331,3 @@ def parse_generalized_time(timestr):
     except ValueError:
         return None
 
-#-------------------------------------------------------------------------------
-
-def get_rpm_nvr_from_header(hdr):
-    'Given an RPM header return the package NVR as a string'
-    name    = hdr['name']
-    version = hdr['version']
-    release = hdr['release']
-
-    return '%s-%s-%s' % (name, version, release)
-
-def get_rpm_nvr_by_name(name):
-    if name is None:
-        return None
-
-    nvr = None
-    try:
-        ts = rpm.ts()
-        mi = ts.dbMatch(rpm.RPMTAG_NAME, name)
-        for h in mi:
-            nvr = get_rpm_nvr_from_header(h)
-            break
-    except:
-        logging.exception('failed to retrieve rpm info for %s', name)
-    return nvr
-
-def split_rpm_nvr(nvr):
-    components = nvr.split('-')
-    release = components[-1]
-    version = components[-2]
-    name    = '-'.join(components[:-2])
-    return (name, version, release)
-
-
-
-
-- 
cgit 


From d98686e96758870cb4a56d41fb0aaae54d4067c5 Mon Sep 17 00:00:00 2001
From: John Dennis <jdennis@redhat.com>
Date: Wed, 21 Nov 2007 13:11:10 -0500
Subject: Add radius profile implementations:   get_radius_profile_by_uid  
 add_radius_profile   update_radius_profile   delete_radius_profile  
 find_radius_profiles

Rewrite command line arg handling, now support pair entry, interactive
mode with auto completion, reading pairs from a file, better handling
of mandatory values, better help, long arg names now match attribute
name in pairs

Establish mappings for all attributes and names used in clients and
profiles

Add notion of containers to radius clients and profiles in LDAP

Move common code, variables, constants, and strings into the files
radius_client.py, radius_util.py, ipautil.py to eliminate redundant
elements which could get out of sync if modified and to provide access
to other code which might benefit from using these items in the
future.

Add utility functions:
  format_list()
  parse_key_value_pairs()

Add utility class:
  AttributeValueCompleter

Unify attribute usage in radius ldap schema
---
 ipa-python/ipautil.py | 330 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 330 insertions(+)

(limited to 'ipa-python/ipautil.py')

diff --git a/ipa-python/ipautil.py b/ipa-python/ipautil.py
index e7f59419..407406de 100644
--- a/ipa-python/ipautil.py
+++ b/ipa-python/ipautil.py
@@ -25,6 +25,10 @@ import logging
 import subprocess
 import os
 import stat
+import copy
+import readline
+import traceback
+from types import *
 
 from string import lower
 import re
@@ -331,3 +335,329 @@ def parse_generalized_time(timestr):
     except ValueError:
         return None
 
+
+def format_list(items, quote=None, page_width=80):
+    '''Format a list of items formatting them so they wrap to fit the
+    available width. The items will be sorted. 
+
+    The items may optionally be quoted. The quote parameter may either be
+    a string, in which case it is added before and after the item. Or the
+    quote parameter may be a pair (either a tuple or list). In this case 
+    quote[0] is left hand quote and quote[1] is the right hand quote.
+    '''
+    left_quote = right_quote = ''
+    num_items = len(items)
+    if not num_items: return text
+
+    if quote is not None:
+        if type(quote) in StringTypes:
+            left_quote = right_quote = quote
+        elif type(quote) is TupleType or type(quote) is ListType:
+            left_quote = quote[0]
+            right_quote = quote[1]
+
+    max_len = max(map(len, items))
+    max_len += len(left_quote) + len(right_quote)
+    num_columns = (page_width + max_len) / (max_len+1)
+    num_rows = (num_items + num_columns - 1) / num_columns
+    items.sort()
+
+    rows = [''] * num_rows
+    i = row = col = 0
+
+    while i < num_items:
+        row = 0
+        if col == 0:
+            separator = ''
+        else:
+            separator = ' '
+
+        while i < num_items and row < num_rows:
+            rows[row] += "%s%*s" % (separator, -max_len, "%s%s%s" % (left_quote, items[i], right_quote))
+            i += 1
+            row += 1
+        col += 1
+    return '\n'.join(rows)
+
+key_value_re = re.compile("([^\s=]+)\s*=\s*((\S+)|(?P<quote>['\\\"])((?P=quote)|(.*?[^\\\])(?P=quote)))")
+def parse_key_value_pairs(input):
+    ''' Given a string composed of key=value pairs parse it and return
+    a dict of the key/value pairs. Keys must be a word, a key must be followed
+    by an equal sign (=) and a value. The value may be a single word or may be
+    quoted. Quotes may be either single or double quotes, but must be balanced.
+    Inside the quoted text the same quote used to start the quoted value may be
+    used if it is escaped by preceding it with a backslash (\).
+    White space between the key, the equal sign, and the value is ignored.
+    Values are always strings. Empty values must be specified with an empty
+    quoted string, it's value after parsing will be an empty string.
+
+    Example: The string
+
+    arg0 = '' arg1 = 1 arg2='two' arg3 = "three's a crowd" arg4 = "this is a \" quote" 
+    
+    will produce
+
+    arg0=   arg1=1
+    arg2=two
+    arg3=three's a crowd
+    arg4=this is a " quote
+    '''
+
+    kv_dict = {}
+    for match in key_value_re.finditer(input):
+        key = match.group(1)
+        quote = match.group('quote')
+        if match.group(5):
+            value = match.group(6)
+            if value is None: value = ''
+            value = re.sub('\\\%s' % quote, quote, value)
+        else:
+            value = match.group(2)
+        kv_dict[key] = value
+    return kv_dict
+
+class AttributeValueCompleter:
+    '''
+    Gets input from the user in the form "lhs operator rhs"
+    TAB completes partial input.
+    lhs completes to a name in @lhs_names
+    The lhs is fully parsed if a lhs_delim delimiter is seen, then TAB will
+    complete to the operator and a default value.
+    Default values for a lhs value can specified as:
+      - a string, all lhs values will use this default
+      - a dict, the lhs value is looked up in the dict to return the default or None
+      - a function with a single arg, the lhs value, it returns the default or None
+
+    After creating the completer you must open it to set the terminal
+    up, Then get a line of input from the user by calling read_input()
+    which returns two values, the lhs and rhs, which might be None if
+    lhs or rhs was not parsed.  After you are done getting input you
+    should close the completer to restore the terminal.
+
+    Example: (note this is essentially what the convenience function get_pairs() does)
+
+    This will allow the user to autocomplete foo & foobar, both have
+    defaults defined in a dict. In addition the foobar attribute must
+    be specified before the prompting loop will exit. Also, this
+    example show how to require that each attrbute entered by the user
+    is valid.
+
+    attrs = ['foo', 'foobar']
+    defaults = {'foo' : 'foo_default', 'foobar' : 'foobar_default'}
+    mandatory_attrs = ['foobar']
+
+    c = AttributeValueCompleter(attrs, defaults)
+    c.open()
+    mandatory_attrs_remaining = copy.copy(mandatory_attrs)
+
+    while True:
+        if mandatory_attrs_remaining:
+            attribute, value = c.read_input("Enter: ", mandatory_attrs_remaining[0])
+            try:
+                mandatory_attrs_remaining.remove(attribute)
+            except ValueError:
+                pass
+        else:
+            attribute, value = c.read_input("Enter: ")
+        if attribute is None:
+            # Are we done?
+            if mandatory_attrs_remaining:
+                print "ERROR, you must specify: %s" % (','.join(mandatory_attrs_remaining))
+                continue
+            else:
+                break
+        if attribute not in attrs:
+            print "ERROR: %s is not a valid attribute" % (attribute)
+        else:
+            print "got '%s' = '%s'" % (attribute, value)
+
+    c.close()
+    print "exiting..."
+    '''
+
+    def __init__(self, lhs_names, default_value=None, lhs_regexp=r'^\s*(?P<lhs>[^ =]+)', lhs_delims=' =',
+                 operator='=', strip_rhs=True):
+        self.lhs_names = lhs_names
+        self.default_value = default_value
+        # lhs_regexp must have named group 'lhs' which returns the contents of the lhs
+        self.lhs_regexp = lhs_regexp
+        self.lhs_re = re.compile(self.lhs_regexp)
+        self.lhs_delims = lhs_delims
+        self.operator = operator
+        self.strip_rhs = strip_rhs
+        self._reset()
+
+    def _reset(self):
+        self.lhs = None
+        self.lhs_complete = False
+        self.operator_complete = False
+        self.rhs = None
+
+    def open(self):
+        # Save state
+        self.prev_completer = readline.get_completer()
+        self.prev_completer_delims = readline.get_completer_delims()
+
+        # Set up for ourself
+        readline.parse_and_bind("tab: complete")
+        readline.set_completer(self.complete)
+        readline.set_completer_delims(self.lhs_delims)
+
+    def close(self):
+        # Restore previous state
+        readline.set_completer_delims(self.prev_completer_delims)
+        readline.set_completer(self.prev_completer)
+        
+    def _debug(self):
+        print  >> output_fd, "lhs='%s' lhs_complete=%s operator='%s' operator_complete=%s rhs='%s'" % \
+            (self.lhs, self.lhs_complete, self.operator, self.operator_complete, self.rhs)
+
+
+    def parse_input(self):
+        '''We are looking for 3 tokens: <lhs,op,rhs>
+        Extract as much of each token as possible.
+        Set flags indicating if token is fully parsed.
+        '''
+        try:
+            self._reset()
+            buf_len = len(self.line_buffer)
+            pos = 0
+            lhs_match = self.lhs_re.search(self.line_buffer, pos)
+            if not lhs_match: return            # no lhs content
+            self.lhs = lhs_match.group('lhs')   # get lhs contents
+            pos = lhs_match.end('lhs')          # new scanning position
+            if pos == buf_len: return           # nothing after lhs, lhs incomplete
+            self.lhs_complete = True            # something trails the lhs, lhs is complete
+            operator_beg = self.line_buffer.find(self.operator, pos) # locate operator
+            if operator_beg == -1: return	# did not find the operator
+            self.operator_complete = True       # operator fully parsed
+            operator_end = operator_beg + len(self.operator)
+            pos = operator_end                  # step over the operator
+            self.rhs = self.line_buffer[pos:]
+        except Exception, e:
+            traceback.print_exc()
+            print "Exception in %s.parse_input(): %s" % (self.__class__.__name__, e)
+
+    def get_default_value(self):
+        '''default_value can be a string, a dict, or a function.
+        If it's a string it's a global default for all attributes.
+        If it's a dict the default is looked up in the dict index by attribute.
+        If it's a function, the function is called with 1 parameter, the attribute
+        and it should return the default value for the attriubte or None'''
+
+        if not self.lhs_complete: raise ValueError("attribute not parsed")
+        default_value_type = type(self.default_value)
+        if default_value_type is DictType:
+            return self.default_value.get(self.lhs, None)
+        elif default_value_type is FunctionType:
+            return self.default_value(self.lhs)
+        elif default_value_type is StringsType:
+            return self.default_value
+        else:
+            return None
+
+    def get_lhs_completions(self, text):
+        if text:
+            self.completions = [lhs for lhs in self.lhs_names if lhs.startswith(text)]
+        else:
+            self.completions = self.lhs_names
+
+    def complete(self, text, state):
+        self.line_buffer= readline.get_line_buffer()
+        self.parse_input()
+        if not self.lhs_complete:
+            # lhs is not complete, set up to complete the lhs
+            if state == 0:
+                beg = readline.get_begidx()
+                end = readline.get_endidx()
+                self.get_lhs_completions(self.line_buffer[beg:end])
+            if state >= len(self.completions): return None
+            return self.completions[state]
+
+
+        elif not self.operator_complete:
+            # lhs is complete, but the operator is not so we complete
+            # by inserting the operator manually.
+            # Also try to complete the default value at this time.
+            readline.insert_text('%s ' % self.operator)
+            default_value = self.get_default_value()
+            if default_value is not None:
+                readline.insert_text(default_value)
+            readline.redisplay()
+            return None
+        else:
+            # lhs and operator are complete, if the the rhs is blank
+            # (either empty or only only whitespace) then attempt
+            # to complete by inserting the default value, otherwise
+            # there is nothing we can complete to so we're done.
+            if self.rhs.strip():
+                return None
+            default_value = self.get_default_value()
+            if default_value is not None:
+                readline.insert_text(default_value)
+                readline.redisplay()
+            return None
+
+    def pre_input_hook(self):
+        readline.insert_text('%s %s ' % (self.initial_lhs, self.operator))
+        readline.redisplay()
+
+    def read_input(self, prompt, initial_lhs=None):
+        self.initial_lhs = initial_lhs
+        try:
+            self._reset()
+            if initial_lhs is None:
+                readline.set_pre_input_hook(None)
+            else:
+                readline.set_pre_input_hook(self.pre_input_hook)
+            self.line_buffer = raw_input(prompt).strip()
+            self.parse_input()
+            if self.strip_rhs and self.rhs is not None:
+                return self.lhs, self.rhs.strip()
+            else:
+                return self.lhs, self.rhs
+        except EOFError:
+            return None, None
+
+    def get_pairs(self, prompt, mandatory_attrs=None, validate_callback=None, must_match=True, value_required=True):
+        pairs = {}
+        if mandatory_attrs:
+            mandatory_attrs_remaining = copy.copy(mandatory_attrs)
+        else:
+            mandatory_attrs_remaining = []
+
+        print "Enter name = value"
+        print "Press <ENTER> to accept, a blank line terminates input"
+        print "Pressing <TAB> will auto completes name, assignment, and value"
+        print
+        while True:
+            if mandatory_attrs_remaining:
+                attribute, value = self.read_input(prompt, mandatory_attrs_remaining[0])
+            else:
+                attribute, value = self.read_input(prompt)
+            if attribute is None:
+                # Are we done?
+                if mandatory_attrs_remaining:
+                    print "ERROR, you must specify: %s" % (','.join(mandatory_attrs_remaining))
+                    continue
+                else:
+                    break
+            if value is None:
+                if value_required:
+                    print "ERROR: you must specify a value for %s" % attribute
+                    continue
+            else:
+                if must_match and attribute not in self.lhs_names:
+                    print "ERROR: %s is not a valid name" % (attribute)
+                    continue
+            if validate_callback is not None:
+                if not validate_callback(attribute, value):
+                    print "ERROR: %s is not valid for %s" % (value, attribute)
+                    continue
+            try:
+                mandatory_attrs_remaining.remove(attribute)
+            except ValueError:
+                pass
+
+            pairs[attribute] = value
+        return pairs
-- 
cgit 


From c5a43a01686ae23e5381bc3b3f4c590774b865f8 Mon Sep 17 00:00:00 2001
From: John Dennis <jdennis@redhat.com>
Date: Mon, 26 Nov 2007 20:59:53 -0500
Subject: add ItemCompleter class

---
 ipa-python/ipautil.py | 102 +++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 101 insertions(+), 1 deletion(-)

(limited to 'ipa-python/ipautil.py')

diff --git a/ipa-python/ipautil.py b/ipa-python/ipautil.py
index 407406de..b5fa9794 100644
--- a/ipa-python/ipautil.py
+++ b/ipa-python/ipautil.py
@@ -619,7 +619,7 @@ class AttributeValueCompleter:
         except EOFError:
             return None, None
 
-    def get_pairs(self, prompt, mandatory_attrs=None, validate_callback=None, must_match=True, value_required=True):
+    def get_pairs(self, prompt, mandatory_attrs=None, validate_callback=None, must_match=Trueo, value_required=True):
         pairs = {}
         if mandatory_attrs:
             mandatory_attrs_remaining = copy.copy(mandatory_attrs)
@@ -661,3 +661,103 @@ class AttributeValueCompleter:
 
             pairs[attribute] = value
         return pairs
+
+class ItemCompleter:
+    '''
+    Prompts the user for items in a list of items with auto completion.
+    TAB completes partial input.
+    More than one item can be specifed during input, whitespace and/or comma's seperate.
+    Example:
+
+    possible_items = ['foo', 'bar']
+    c = ItemCompleter(possible_items)
+    c.open()
+    # Use read_input() to limit input to a single carriage return (e.g. <ENTER>)
+    #items = c.read_input("Enter: ")
+    # Use get_items to iterate until a blank line is entered.
+    items = c.get_items("Enter: ")
+    c.close()
+    print "items=%s" % (items)
+
+    '''
+
+    def __init__(self, items, must_match=True):
+        self.items = items
+        self.must_match = must_match
+        self.initial_input = None
+        self.item_delims = ' \t,'
+        self.split_re = re.compile('[%s]+' % self.item_delims)
+
+    def open(self):
+        # Save state
+        self.prev_completer = readline.get_completer()
+        self.prev_completer_delims = readline.get_completer_delims()
+
+        # Set up for ourself
+        readline.parse_and_bind("tab: complete")
+        readline.set_completer(self.complete)
+        readline.set_completer_delims(self.item_delims)
+
+    def close(self):
+        # Restore previous state
+        readline.set_completer_delims(self.prev_completer_delims)
+        readline.set_completer(self.prev_completer)
+        
+    def get_item_completions(self, text):
+        if text:
+            self.completions = [lhs for lhs in self.items if lhs.startswith(text)]
+        else:
+            self.completions = self.items
+
+    def complete(self, text, state):
+        self.line_buffer= readline.get_line_buffer()
+        if state == 0:
+            beg = readline.get_begidx()
+            end = readline.get_endidx()
+            self.get_item_completions(self.line_buffer[beg:end])
+        if state >= len(self.completions): return None
+        return self.completions[state]
+
+    def pre_input_hook(self):
+        readline.insert_text('%s %s ' % (self.initial_input, self.operator))
+        readline.redisplay()
+
+    def read_input(self, prompt, initial_input=None):
+        items = []
+        
+        self.initial_input = initial_input
+        try:
+            if initial_input is None:
+                readline.set_pre_input_hook(None)
+            else:
+                readline.set_pre_input_hook(self.pre_input_hook)
+            self.line_buffer = raw_input(prompt).strip()
+            items = self.split_re.split(self.line_buffer)
+            print items
+            for item in items[:]:
+                if not item: items.remove(item)
+            if self.must_match:
+                for item in items[:]:
+                    if item not in self.items:
+                        print "ERROR: %s is not valid" % (item)
+                        items.remove(item)
+            return items
+        except EOFError:
+            return items
+
+    def get_items(self, prompt):
+        items = []
+
+        print "Enter name [name ...]"
+        print "Press <ENTER> to accept, control-D terminates input"
+        print "Pressing <TAB> auto completes name"
+        print
+        while True:
+            new_items = self.read_input(prompt)
+            if new_items is None: break
+            for item in new_items:
+                if item in items: continue
+                items.append(item)
+
+        return items
+
-- 
cgit 


From 78b5987101c3d489c8397da05546d72e24aeea4c Mon Sep 17 00:00:00 2001
From: John Dennis <jdennis@redhat.com>
Date: Mon, 26 Nov 2007 23:11:49 -0500
Subject: add parse_items(), read_items_file() move read_pairs_file() to
 ipautil

---
 ipa-python/ipautil.py | 34 +++++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

(limited to 'ipa-python/ipautil.py')

diff --git a/ipa-python/ipautil.py b/ipa-python/ipautil.py
index b5fa9794..f8310ae4 100644
--- a/ipa-python/ipautil.py
+++ b/ipa-python/ipautil.py
@@ -416,6 +416,39 @@ def parse_key_value_pairs(input):
         kv_dict[key] = value
     return kv_dict
 
+def parse_items(text):
+    '''Given text with items separated by whitespace or comma, return a list of those items'''
+    split_re = re.compile('[ ,\t\n]+')
+    items = split_re.split(text)
+    for item in items[:]:
+        if not item: items.remove(item)
+    return items
+
+def read_pairs_file(filename):
+    comment_re = re.compile('#.*$', re.MULTILINE)
+    if filename == '-':
+        fd = sys.stdin
+    else:
+        fd = open(filename)
+    text = fd.read()
+    text = comment_re.sub('', text) # kill comments
+    pairs = ipautil.parse_key_value_pairs(text)
+    if fd != sys.stdin: fd.close()
+    return pairs
+
+def read_items_file(filename):
+    comment_re = re.compile('#.*$', re.MULTILINE)
+    if filename == '-':
+        fd = sys.stdin
+    else:
+        fd = open(filename)
+    text = fd.read()
+    text = comment_re.sub('', text) # kill comments
+    items = ipautil.parse_items(text)
+    if fd != sys.stdin: fd.close()
+    return items
+
+
 class AttributeValueCompleter:
     '''
     Gets input from the user in the form "lhs operator rhs"
@@ -733,7 +766,6 @@ class ItemCompleter:
                 readline.set_pre_input_hook(self.pre_input_hook)
             self.line_buffer = raw_input(prompt).strip()
             items = self.split_re.split(self.line_buffer)
-            print items
             for item in items[:]:
                 if not item: items.remove(item)
             if self.must_match:
-- 
cgit 


From 5d1ca46ea79d5a70362248b06dd4587518f78150 Mon Sep 17 00:00:00 2001
From: John Dennis <jdennis@redhat.com>
Date: Tue, 27 Nov 2007 16:16:10 -0500
Subject: do a better job of handling attribute deletion

---
 ipa-python/ipautil.py | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

(limited to 'ipa-python/ipautil.py')

diff --git a/ipa-python/ipautil.py b/ipa-python/ipautil.py
index f8310ae4..8839e6cf 100644
--- a/ipa-python/ipautil.py
+++ b/ipa-python/ipautil.py
@@ -25,7 +25,6 @@ import logging
 import subprocess
 import os
 import stat
-import copy
 import readline
 import traceback
 from types import *
@@ -481,7 +480,7 @@ class AttributeValueCompleter:
 
     c = AttributeValueCompleter(attrs, defaults)
     c.open()
-    mandatory_attrs_remaining = copy.copy(mandatory_attrs)
+    mandatory_attrs_remaining = mandatory_attrs[:]
 
     while True:
         if mandatory_attrs_remaining:
@@ -652,10 +651,10 @@ class AttributeValueCompleter:
         except EOFError:
             return None, None
 
-    def get_pairs(self, prompt, mandatory_attrs=None, validate_callback=None, must_match=Trueo, value_required=True):
+    def get_pairs(self, prompt, mandatory_attrs=None, validate_callback=None, must_match=True, value_required=True):
         pairs = {}
         if mandatory_attrs:
-            mandatory_attrs_remaining = copy.copy(mandatory_attrs)
+            mandatory_attrs_remaining = mandatory_attrs[:]
         else:
             mandatory_attrs_remaining = []
 
@@ -714,9 +713,8 @@ class ItemCompleter:
 
     '''
 
-    def __init__(self, items, must_match=True):
+    def __init__(self, items):
         self.items = items
-        self.must_match = must_match
         self.initial_input = None
         self.item_delims = ' \t,'
         self.split_re = re.compile('[%s]+' % self.item_delims)
@@ -768,26 +766,25 @@ class ItemCompleter:
             items = self.split_re.split(self.line_buffer)
             for item in items[:]:
                 if not item: items.remove(item)
-            if self.must_match:
-                for item in items[:]:
-                    if item not in self.items:
-                        print "ERROR: %s is not valid" % (item)
-                        items.remove(item)
             return items
         except EOFError:
             return items
 
-    def get_items(self, prompt):
+    def get_items(self, prompt, must_match=True):
         items = []
 
         print "Enter name [name ...]"
-        print "Press <ENTER> to accept, control-D terminates input"
+        print "Press <ENTER> to accept, blank line or control-D terminates input"
         print "Pressing <TAB> auto completes name"
         print
         while True:
             new_items = self.read_input(prompt)
-            if new_items is None: break
+            if not new_items: break
             for item in new_items:
+                if must_match:
+                    if item not in self.items:
+                        print "ERROR: %s is not valid" % (item)
+                        continue
                 if item in items: continue
                 items.append(item)
 
-- 
cgit 


From c939c5d289daaf4c855caa2a6816e7eeba7e2661 Mon Sep 17 00:00:00 2001
From: John Dennis <jdennis@redhat.com>
Date: Tue, 27 Nov 2007 22:52:11 -0500
Subject: fix regular expression used in parse_key_value_pairs()

---
 ipa-python/ipautil.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ipa-python/ipautil.py')

diff --git a/ipa-python/ipautil.py b/ipa-python/ipautil.py
index 8839e6cf..9584f928 100644
--- a/ipa-python/ipautil.py
+++ b/ipa-python/ipautil.py
@@ -378,7 +378,7 @@ def format_list(items, quote=None, page_width=80):
         col += 1
     return '\n'.join(rows)
 
-key_value_re = re.compile("([^\s=]+)\s*=\s*((\S+)|(?P<quote>['\\\"])((?P=quote)|(.*?[^\\\])(?P=quote)))")
+key_value_re = re.compile("(\w+)\s*=\s*(([^\s'\\\"]+)|(?P<quote>['\\\"])((?P=quote)|(.*?[^\\\])(?P=quote)))")
 def parse_key_value_pairs(input):
     ''' Given a string composed of key=value pairs parse it and return
     a dict of the key/value pairs. Keys must be a word, a key must be followed
-- 
cgit 


From d7a7ba4f45d189c841c28bd5bfbe1f4b4b721154 Mon Sep 17 00:00:00 2001
From: John Dennis <jdennis@redhat.com>
Date: Wed, 28 Nov 2007 12:06:06 -0500
Subject: add user profile command line arg to all radius profile command line
 tools to select between shared and per user profiles

modify AttributeValueCompleter so default values prefer
previously entered values in editing session
---
 ipa-python/ipautil.py | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'ipa-python/ipautil.py')

diff --git a/ipa-python/ipautil.py b/ipa-python/ipautil.py
index 5f7d396a..7006e195 100644
--- a/ipa-python/ipautil.py
+++ b/ipa-python/ipautil.py
@@ -528,6 +528,7 @@ class AttributeValueCompleter:
         self.lhs_delims = lhs_delims
         self.operator = operator
         self.strip_rhs = strip_rhs
+        self.pairs = None
         self._reset()
 
     def _reset(self):
@@ -589,6 +590,13 @@ class AttributeValueCompleter:
         and it should return the default value for the attriubte or None'''
 
         if not self.lhs_complete: raise ValueError("attribute not parsed")
+
+        # If the user previously provided a value let that override the supplied default
+        if self.pairs is not None:
+            prev_value = self.pairs.get(self.lhs)
+            if prev_value is not None: return prev_value
+
+        # No previous user provided value, query for a default
         default_value_type = type(self.default_value)
         if default_value_type is DictType:
             return self.default_value.get(self.lhs, None)
@@ -663,7 +671,7 @@ class AttributeValueCompleter:
             return None, None
 
     def get_pairs(self, prompt, mandatory_attrs=None, validate_callback=None, must_match=True, value_required=True):
-        pairs = {}
+        self.pairs = {}
         if mandatory_attrs:
             mandatory_attrs_remaining = mandatory_attrs[:]
         else:
@@ -702,8 +710,8 @@ class AttributeValueCompleter:
             except ValueError:
                 pass
 
-            pairs[attribute] = value
-        return pairs
+            self.pairs[attribute] = value
+        return self.pairs
 
 class ItemCompleter:
     '''
-- 
cgit 


From 3b4f0db73e73912e39baa4a4c8b8c2e9ae3ab5be Mon Sep 17 00:00:00 2001
From: Karl MacMillan <kmacmill@redhat.com>
Date: Thu, 6 Dec 2007 17:17:43 -0500
Subject: Convert the setup of ssl from a shell script to a python module. This
 is in preparation for user supplied certs.

---
 ipa-python/ipautil.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'ipa-python/ipautil.py')

diff --git a/ipa-python/ipautil.py b/ipa-python/ipautil.py
index ffe75a90..3c2b37f7 100644
--- a/ipa-python/ipautil.py
+++ b/ipa-python/ipautil.py
@@ -27,6 +27,7 @@ from random import Random
 from time import gmtime
 import os, sys, traceback, readline
 import stat
+import shutil
 
 from types import *
 
@@ -101,6 +102,15 @@ def dir_exists(filename):
     except:
         return False
 
+def install_file(fname, dest):
+    if file_exists(dest):
+        os.rename(dest, dest + ".orig")
+    shutil.move(fname, dest)
+
+def backup_file(fname):
+    if file_exists(fname):
+        os.rename(fname, fname + ".orig")
+
 class CIDict(dict):
     """
     Case-insensitive but case-respecting dictionary.
-- 
cgit