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

Author: jonasbardino

tests/fixture/confs-stdlocal/MiG.conf

@@ -14,7 +14,7 @@ ServerAdmin testuser
 # We may need to run as MiG user or group for file access to work
 # through CGI scripts and for direct user file access
 User testuser
-Group tesggroup
+Group testgroup
 
 # Performance Tuning
 StartServers 5
@@ -188,7 +188,7 @@ Alias /.well-known/security.txt "/home/mig/state/wwwpublic/.well-known/security.
     # Please note that the processes number here is a FIXED cap on available 
     # worker processes so it strictly limits the number of concurrent clients.
     <IfDefine BASE_FQDN>
-        WSGIDaemonProcess ${BASE_FQDN} processes=10 threads=1 display-name=%{GROUP} user=testuser group=tesggroup python-path=/home/mig/mig  maximum-requests=1000
+        WSGIDaemonProcess ${BASE_FQDN} processes=10 threads=1 display-name=%{GROUP} user=testuser group=testgroup python-path=/home/mig/mig  maximum-requests=1000
         WSGIProcessGroup ${BASE_FQDN}
     </IfDefine>
     # Make sure wsgi sockets are fully accessible to testuser
@@ -1015,7 +1015,7 @@ Alias /.well-known/security.txt "/home/mig/state/wwwpublic/.well-known/security.
 
     RewriteMap escape int:escape
     RewriteMap unescape int:unescape
-    RewriteMap chkuserroot prg:/home/mig/mig/server/chkuserroot.py testuser:tesggroup
+    RewriteMap chkuserroot prg:/home/mig/mig/server/chkuserroot.py testuser:testgroup
 
     # Careful to avoid breakage with exotic chars like percent in filenames. 
     # Prepend certificate DN so that we can modify it further without PATH
@@ -1474,7 +1474,7 @@ Alias /.well-known/security.txt "/home/mig/state/wwwpublic/.well-known/security.
 
     RewriteMap escape int:escape
     RewriteMap unescape int:unescape
-    RewriteMap chkuserroot prg:/home/mig/mig/server/chkuserroot.py testuser:tesggroup
+    RewriteMap chkuserroot prg:/home/mig/mig/server/chkuserroot.py testuser:testgroup
 
     # Careful to avoid breakage with exotic chars like percent in filenames. 
     # Prepend certificate DN so that we can modify it further without PATH
@@ -2149,7 +2149,7 @@ Alias /.well-known/security.txt "/home/mig/state/wwwpublic/.well-known/security.
 
     RewriteMap escape int:escape
     RewriteMap unescape int:unescape
-    RewriteMap chkuserroot prg:/home/mig/mig/server/chkuserroot.py testuser:tesggroup
+    RewriteMap chkuserroot prg:/home/mig/mig/server/chkuserroot.py testuser:testgroup
 
     # Careful to avoid breakage with exotic chars like percent in filenames. 
     # Fake certificate DN so that we can modify it further without PATH
@@ -2750,7 +2750,7 @@ Alias /.well-known/security.txt "/home/mig/state/wwwpublic/.well-known/security.
 
     RewriteMap escape int:escape
     RewriteMap unescape int:unescape
-    RewriteMap chkuserroot prg:/home/mig/mig/server/chkuserroot.py testuser:tesggroup
+    RewriteMap chkuserroot prg:/home/mig/mig/server/chkuserroot.py testuser:testgroup
 
     # Careful to avoid breakage with exotic chars like percent in filenames. 
     # Fake certificate DN so that we can modify it further without PATH
@@ -3666,7 +3666,7 @@ Alias /.well-known/security.txt "/home/mig/state/wwwpublic/.well-known/security.
 
     RewriteMap escape int:escape
     RewriteMap unescape int:unescape
-    RewriteMap chkuserroot prg:/home/mig/mig/server/chkuserroot.py testuser:tesggroup
+    RewriteMap chkuserroot prg:/home/mig/mig/server/chkuserroot.py testuser:testgroup
 
     # NOTE: the REMOTE_USER below requires a recent mod_auth_openidc to work.
     #       It was just empty with mod_auth_openidc-1.8.8 but works with 2.4.12
@@ -4148,7 +4148,7 @@ Alias /.well-known/security.txt "/home/mig/state/wwwpublic/.well-known/security.
 
     # Set up chroot checking helper
 
-    RewriteMap chksidroot prg:/home/mig/mig/server/chksidroot.py testuser:tesggroup
+    RewriteMap chksidroot prg:/home/mig/mig/server/chksidroot.py testuser:testgroup
 
     # Prevent e.g. symlinks escaping user chroots hidden behind session or
     # sharelink symlinks.

tests/fixture/confs-stdlocal/envvars

@@ -13,7 +13,7 @@ APACHE_SUFFIX=
 # settings are defined via environment variables and then used in apache(2)?ctl,
 # /etc/init.d/${APACHE_DAEMON}, /etc/logrotate.d/${APACHE_DAEMON}, etc.
 APACHE_RUN_USER=testuser
-APACHE_RUN_GROUP=tesggroup
+APACHE_RUN_GROUP=testgroup
 APACHE_PID_FILE=/var/run/apache2.pid
 APACHE_RUN_DIR=/var/run
 APACHE_LOCK_DIR=/var/lock

tests/fixture/confs-stdlocal/logrotate-migrid

@@ -5,10 +5,10 @@
 	compress
 	delaycompress
 	notifempty
-	create 640 testuser tesggroup
+	create 640 testuser testgroup
 	# NOTE we need root to restart services
-	#su testuser tesggroup
-	su root tesggroup
+	#su testuser testgroup
+	su root testgroup
 	sharedscripts
 	postrotate
            service migrid reload; \

tests/fixture/confs-stdlocal/migcheckssl

@@ -30,7 +30,7 @@ export PATH="/usr/local/sbin:${PATH}"
 
 domain=""
 mig_user="testuser"
-mig_group="tesggroup"
+mig_group="testgroup"
 cert_base="/home/mig/certs"
 cert_path="${cert_base}/letsencrypt"
 domain_cert_path="${cert_path}/${domain}"

tests/fixture/confs-stdlocal/sshd_config-MiG-sftp-subsys

@@ -161,13 +161,13 @@ MaxStartups 10:30:100
 Subsystem   sftp    /home/mig/mig/server/sftp_subsys.py
 
 # IMPORTANT: please make sure to also restrict any native sshd to deny login
-#            from ALL users entering as user testuser or group tesggroup with
+#            from ALL users entering as user testuser or group testgroup with
 #            DenyUsers testuser
-#            DenyGroups tesggroup
+#            DenyGroups testgroup
 
 # NOTE: Only allow MiG users on this sshd instance, and sftp-only access
-AllowGroups tesggroup
-Match Group tesggroup
+AllowGroups testgroup
+Match Group testgroup
     # Look for public keys in standard authorized_keys file in home and 
     # optionally in job and jupyter session mount key location if enabled.
     AuthorizedKeysFile    %h/.ssh/authorized_keys

tests/support.py

@@ -129,7 +129,7 @@ def warning(self, line):
     def write(self, message):
         channel, namespace, specifics = message.split(':', 2)
 
-        # ignore everything except warnings sent by th python runtime
+        # ignore everything except warnings sent by the python runtime
         if not (channel == 'WARNING' and namespace == 'py.warnings'):
             return
 

tests/test_mig_shared_install.py

@@ -82,7 +82,7 @@ def test_creates_output_directory_containing_a_standard_local_configuration(self
             destination=symlink_path,
             destination_suffix='-stdlocal',
             user='testuser',
-            group='tesggroup',
+            group='testgroup',
             timezone='Test/Place',
             crypto_salt='_TEST_CRYPTO_SALT'.zfill(32),
             digest_salt='_TEST_DIGEST_SALT'.zfill(32),