Make use of argument bundles in the server.

Author: albu-diku

mig/server/createuser.py

@@ -219,7 +219,11 @@ def main(_main, args, cwd, db_path=keyword_auto):
             if verbose:
                 print('using configuration from MIG_CONF (or default)')
 
-    bundle = _BUNDLE_DEFINITION(*args)
+    try:
+        bundle = _BUNDLE_DEFINITION(*args)
+    except ValueError as valueexc:
+        print(valueexc)
+        sys.exit(1)
 
     ret = _main(None, bundle,
           conf_path=conf_path,
@@ -249,7 +253,7 @@ def main(_main, args, cwd, db_path=keyword_auto):
     sys.exit(ret)
 
 
-def _main(configuration, args,
+def _main(configuration, bundle,
           conf_path=keyword_auto,
           db_path=keyword_auto,
           auth_type='custom',
@@ -268,6 +272,9 @@ def _main(configuration, args,
           hash_password=True,
           _generate_salt=None
           ):
+
+    args = _BUNDLE_DEFINITION.ensure_bundle(bundle)
+
     if configuration is None:
         if conf_path == keyword_auto:
             config_file = None

mig/services/coreapi/server.py

@@ -77,7 +77,8 @@
     check_hash, search_users as useradm_search_users
 from mig.shared.userdb import default_db_path
 from mig.shared.validstring import possible_user_id, is_valid_email_address
-from mig.server.createuser import _main as createuser
+from mig.server.createuser import _main as createuser, \
+    _BUNDLE_DEFINITION as _REQUEST_ARGS_POST_USER
 
 # Update with extra fields
 cert_field_map.update({'role': 'ROLE', 'timezone': 'TZ', 'nickname': 'NICK',
@@ -171,38 +172,6 @@ def serialize(self, output_format='text'):
             return 'payload failed to validate:%s' % ('\n'.join(lines),)
 
 
-def _is_not_none(value):
-    """value is not None"""
-    return value is not None
-
-
-def _is_string_and_non_empty(value):
-    """value is a non-empty string"""
-    return isinstance(value, str) and len(value) > 0
-
-
-_REQUEST_ARGS_POST_USER = namedtuple('PostUserArgs', [
-    'full_name',
-    'organization',
-    'state',
-    'country',
-    'email',
-    'comment',
-    'password',
-])
-
-
-_REQUEST_ARGS_POST_USER._validators = defaultdict(lambda: _is_not_none, dict(
-    full_name=_is_string_and_non_empty,
-    organization=_is_string_and_non_empty,
-    state=_is_string_and_non_empty,
-    country=_is_string_and_non_empty,
-    email=_is_string_and_non_empty,
-    comment=_is_string_and_non_empty,
-    password=_is_string_and_non_empty,
-))
-
-
 def search_users(configuration, search_filter):
     conf_path = configuration.config_file
     db_path = default_db_path(configuration)
@@ -214,7 +183,7 @@ def validate_payload(definition, payload):
     args = definition(*[payload.get(field, None) for field in definition._fields])
 
     errors_by_field = {}
-    for field_name, field_value in args._asdict().items():
+    for field_name, field_value in args.items():
         validator_fn = definition._validators[field_name]
         if not validator_fn(field_value):
             errors_by_field[field_name] = validator_fn.__doc__
@@ -257,9 +226,7 @@ def POST_user():
         except ValidationReport as vr:
             return http_error_from_status_code(400, None, vr.serialize())
 
-        args = list(validated)
-
-        ret = createuser(configuration, args)
+        ret = createuser(configuration, validated)
         if ret != 0:
             raise http_error_from_status_code(400, None)
 

tests/test_mig_server_createuser.py

@@ -37,7 +37,8 @@
 from tests.support.picklesupp import PickleAssertMixin
 
 from mig.shared.arguments import ArgumentBundle
-from mig.server.createuser import _main as createuser, main as createuser_main
+from mig.server.createuser import _main as createuser, \
+    main as createuser_main, _BUNDLE_DEFINITION
 from mig.shared.useradm import _USERADM_CONFIG_DIR_KEYS
 
 
@@ -84,17 +85,17 @@ def _instrumented_main(*args, **kwargs):
         self.assertEqual(maybe_argument_bundle.name, 'UserArguments')
 
     def test_user_db_is_created_when_absent(self):
-        args = [
+        bundle = _BUNDLE_DEFINITION(*[
             "Test User",
             "Test Org",
             "NA",
             "DK",
             "user@example.com",
             "This is the create comment",
             "password"
-        ]
+        ])
         print("")  # acount for output generated by the logic
-        createuser(self.configuration, args, default_renew=True)
+        createuser(self.configuration, bundle, default_renew=True)
 
         # presence of user home
         path_kind = MigTestCase._absolute_path_kind(self.expected_user_db_home)
@@ -117,18 +118,18 @@ def _generate_salt():
         else:
             expected_user_password_hash = "PBKDF2$sha256$10000$b'CCCC12344321CCCC'$b'bph8p/avUq42IYeOdJoJuUqrJ7Q32eaT'"
 
-        args = [
+        bundle = _BUNDLE_DEFINITION(*[
             "Test User",
             "Test Org",
             "NA",
             "DK",
             "user@example.com",
             "This is the create comment",
             "password"
-        ]
+        ])
         print("")  # acount for output generated by the logic
 
-        createuser(self.configuration, args, default_renew=True,
+        createuser(self.configuration, bundle, default_renew=True,
             _generate_salt=_generate_salt)
 
         pickled = self.assertPickledFile(self.expected_user_db_file)
@@ -160,20 +161,20 @@ def _generate_salt():
         })
 
     def test_missing_arguments(self):
-        args = [
-            "Test User",
-            "Test Org",
-            "NA",
-            "DK",
-            "user@example.com",
-            "This is the create comment",
-            #  leave off a password
-        ]
-        print("")  # acount for output generated by the logic
-
-        ret = createuser(self.configuration, args)
-
-        self.assertEqual(ret, errno.ENOTSUP)
+        with self.assertRaises(ValueError) as raised:
+            _BUNDLE_DEFINITION(*[
+                "Test User",
+                "Test Org",
+                "NA",
+                "DK",
+                "user@example.com",
+                "This is the create comment",
+                #  leave off a password
+            ])
+
+        theexception = raised.exception
+        self.assertEqual(str(theexception),
+            "Error: too few arguments given (expected 7 got 6)")
 
 if __name__ == '__main__':
     testmain()