Merge remote-tracking branch 'origin/master' into edge

Author: jonasbardino

README

@@ -384,6 +384,8 @@ settings:
 --source=SOURCE
 --destination=DESTINATION
 --destination_suffix=DESTINATION_SUFFIX
+--auto_add_filter_fields=AUTO_ADD_FILTER_FIELDS
+--auto_add_filter_method=AUTO_ADD_FILTER_METHOD
 --base_fqdn=BASE_FQDN
 --public_fqdn=PUBLIC_FQDN
 --public_alias_fqdn=PUBLIC_ALIAS_FQDN
@@ -727,6 +729,7 @@ or the same on centos
                    --wsgi_procs=25 --sftp_subsys_auth_procs=20 \
                    --sftp_max_sessions=16 \
                    --auto_add_oid_user=True --auto_add_cert_user=True \
+                   --auto_add_filter_fields=full_name --auto_add_filter_method=skip \
                    --io_account_expire=True \
                    --password_policy="MODERN:12" \
                    --password_legacy_policy=MEDIUM \
@@ -796,6 +799,7 @@ optimized SFTP, Seafile integration and OpenID login:
                    --default_menu="home files submitjob jobs vgrids settings setup logout" \
                    --user_menu="sharelinks people seafile crontab transfers peers downloads docs" \
                    --auto_add_oid_user=True --auto_add_cert_user=True \
+                   --auto_add_filter_fields=full_name --auto_add_filter_method=skip \
                    --secscan_addr="130.226.158.3 130.225.213.72 192.38.10.137"
 
 and the same with added Jupyter+cloud integration and optional 2FA support:
@@ -881,6 +885,7 @@ and the same with added Jupyter+cloud integration and optional 2FA support:
                    --external_doc=https://erda.ku.dk \
                    --mig_oid_title="Non-KU/UCPH" --ext_oid_title="KU/UCPH" \
                    --auto_add_oid_user=True --auto_add_cert_user=True \
+                   --auto_add_filter_fields=full_name --auto_add_filter_method=skip \
                    --freeze_to_tape="4w" --io_account_expire=True \
                    --password_policy="MODERN:12" \
                    --password_legacy_policy=MEDIUM \
@@ -969,6 +974,7 @@ with optional 2-FA support and legacy sftp clients:
                    --external_doc=https://www.idmc.dk \
                    --mig_oid_title="Non-KU/UCPH" --ext_oid_title="KU/UCPH" \
                    --auto_add_oid_user=True --auto_add_cert_user=True \
+                   --auto_add_filter_fields=full_name --auto_add_filter_method=skip \
                    --io_account_expire=True \
                    --password_policy="MODERN:12" \
                    --password_legacy_policy=MEDIUM \
@@ -991,6 +997,7 @@ https://en.wikipedia.org/wiki/General_Data_Protection_Regulation
                    --auto_add_cert_user=False \
                    --auto_add_oid_user=True \
                    --auto_add_oidc_user=False \ 
+                   --auto_add_filter_fields=full_name --auto_add_filter_method=skip \
                    --oid_valid_days=180 \
                    --base_fqdn=sif.erda.dk \
                    --public_fqdn=sif-www.erda.dk \

mig/install/MiGserver-template.conf

@@ -20,11 +20,11 @@ auto_add_oidc_user = __AUTO_ADD_OIDC_USER__
 # User ID fields to filter: full_name, organization, ...
 # Leave filter fields empty or unset to disable all filters and let input
 # validation simply reject user sign up if names contain such characters.
-auto_add_filter_fields = 
+auto_add_filter_fields = __AUTO_ADD_FILTER_FIELDS__
 # How to handle each illegal character in the configured filter fields. The
 # default is to skip each such character. Other valid options include hexlify
 # to encode each such character with the corresponding hex codepoint.
-auto_add_filter_method = skip
+auto_add_filter_method = __AUTO_ADD_FILTER_METHOD__
 # Default account expiry unless set. Renew and web login extends by default.
 cert_valid_days = __CERT_VALID_DAYS__
 oid_valid_days = __OID_VALID_DAYS__

mig/install/generateconfs.py

@@ -68,6 +68,8 @@ def usage(options):
         'source',
         'destination',
         'destination_suffix',
+        'auto_add_filter_fields',
+        'auto_add_filter_method',
         'base_fqdn',
         'public_fqdn',
         'public_alias_fqdn',

mig/shared/install.py

@@ -232,6 +232,8 @@ def generate_confs(
     auto_add_cert_user=False,
     auto_add_oid_user=False,
     auto_add_oidc_user=False,
+    auto_add_filter_fields='',
+    auto_add_filter_method='skip',
     cert_valid_days=365,
     oid_valid_days=365,
     oidc_valid_days=365,
@@ -474,6 +476,8 @@ def generate_confs(
     user_dict['__AUTO_ADD_CERT_USER__'] = "%s" % auto_add_cert_user
     user_dict['__AUTO_ADD_OID_USER__'] = "%s" % auto_add_oid_user
     user_dict['__AUTO_ADD_OIDC_USER__'] = "%s" % auto_add_oidc_user
+    user_dict['__AUTO_ADD_FILTER_FIELDS__'] = auto_add_filter_fields
+    user_dict['__AUTO_ADD_FILTER_METHOD__'] = auto_add_filter_method
     user_dict['__CERT_VALID_DAYS__'] = "%s" % cert_valid_days
     user_dict['__OID_VALID_DAYS__'] = "%s" % oid_valid_days
     user_dict['__OIDC_VALID_DAYS__'] = "%s" % oidc_valid_days
@@ -2116,6 +2120,8 @@ def create_user(
     auto_add_cert_user = False
     auto_add_oid_user = False
     auto_add_oidc_user = False
+    auto_add_filter_fields = ''
+    auto_add_filter_method = 'skip'
     cert_valid_days = 365
     oid_valid_days = 365
     oidc_valid_days = 365
@@ -2260,6 +2266,8 @@ def create_user(
         auto_add_cert_user,
         auto_add_oid_user,
         auto_add_oidc_user,
+        auto_add_filter_fields,
+        auto_add_filter_method,
         cert_valid_days,
         oid_valid_days,
         oidc_valid_days,