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

jonasbardino · jonasbardino · commit 31476cffde29 · 2025-01-03T17:21:25.000+01:00
diff --git a/README b/README
@@ -761,7 +761,7 @@ local OpenID login and added Jupyter+cloud integration for data analysis:
                    --mig_cert_fqdn= \
                    --ext_cert_fqdn=cert.erda.dk \
                    --mig_oid_fqdn=ext.erda.dk \
-                   --ext_oid_fqdn=erda.dk \
+                   --ext_oid_fqdn=oid.erda.dk \
                    --ext_oidc_fqdn=oidc.erda.dk \
                    --sid_fqdn=sid.erda.dk \
                    --io_fqdn=io.erda.dk \
diff --git a/mig/images/site-conf-dev-sif.erda.dk.js b/mig/images/site-conf-dev-sif.erda.dk.js
@@ -1,5 +1,5 @@
-/* 
-   Local site variables to adjust look n' feel of what is displayed on the 
+/*
+   Local site variables to adjust look n' feel of what is displayed on the
    'static' html pages with javascript content loading on this site.
 
 */
@@ -11,6 +11,6 @@ function get_site_conf(key) {
         value = ["ALL", "SIF", "DEV.SIF"];
     } else if (key === 'auth_methods') {
         value = ["extoid", "migoid"];
-    } 
+    }
     return value;
 }
diff --git a/mig/images/site-conf-dev.erda.dk.js b/mig/images/site-conf-dev.erda.dk.js
@@ -1,5 +1,5 @@
-/* 
-   Local site variables to adjust look n' feel of what is displayed on the 
+/*
+   Local site variables to adjust look n' feel of what is displayed on the
    'static' html pages with javascript content loading on this site.
 
 */
@@ -10,7 +10,7 @@ function get_site_conf(key) {
     } else if (key === 'system_match') {
         value = ["ALL", "ERDA", "DEV.ERDA"];
     } else if (key === 'auth_methods') {
-        value = ["extoid", "extoidc", "migoid", "extcert"];
-    } 
+        value = ["extoidc", "migoid", "extcert"];
+    }
     return value;
 }
diff --git a/mig/images/site-conf-erda.dk.js b/mig/images/site-conf-erda.dk.js
@@ -1,5 +1,5 @@
-/* 
-   Local site variables to adjust look n' feel of what is displayed on the 
+/*
+   Local site variables to adjust look n' feel of what is displayed on the
    'static' html pages with javascript content loading on this site.
 
 */
@@ -10,7 +10,7 @@ function get_site_conf(key) {
     } else if (key === 'system_match') {
         value = ["ALL", "ERDA"];
     } else if (key === 'auth_methods') {
-        value = ["extoid", "migoid", "extcert"];
-    } 
+        value = ["extoidc", "migoid", "extcert"];
+    }
     return value;
 }
diff --git a/mig/images/site-conf-idmc.dk.js b/mig/images/site-conf-idmc.dk.js
@@ -1,5 +1,5 @@
-/* 
-   Local site variables to adjust look n' feel of what is displayed on the 
+/*
+   Local site variables to adjust look n' feel of what is displayed on the
    'static' html pages with javascript content loading on this site.
 
 */
@@ -9,6 +9,8 @@ function get_site_conf(key) {
         value = "status-events.json";
     } else if (key === 'system_match') {
         value = ["ALL", "IDMC"];
-    } 
+    } else if (key === 'auth_methods') {
+        value = ["extoidc", "migoid", "extcert"];
+    }
     return value;
 }
diff --git a/mig/images/site-conf-migrid.org.js b/mig/images/site-conf-migrid.org.js
@@ -1,5 +1,5 @@
-/* 
-   Local site variables to adjust look n' feel of what is displayed on the 
+/*
+   Local site variables to adjust look n' feel of what is displayed on the
    'static' html pages with javascript content loading on this site.
 
 */
@@ -11,6 +11,6 @@ function get_site_conf(key) {
         value = ["ALL", "MiGrid"];
     } else if (key === 'auth_methods') {
         value = ["extoidc", "migoid", "extcert"];
-    } 
+    }
     return value;
 }
diff --git a/mig/images/site-conf-sif.erda.dk.js b/mig/images/site-conf-sif.erda.dk.js
@@ -1,5 +1,5 @@
-/* 
-   Local site variables to adjust look n' feel of what is displayed on the 
+/*
+   Local site variables to adjust look n' feel of what is displayed on the
    'static' html pages with javascript content loading on this site.
 
 */
@@ -11,6 +11,6 @@ function get_site_conf(key) {
         value = ["ALL", "SIF"];
     } else if (key === 'auth_methods') {
         value = ["extoid", "migoid"];
-    } 
+    }
     return value;
 }
diff --git a/mig/images/site-conf-status.erda.dk.js b/mig/images/site-conf-status.erda.dk.js
@@ -1,5 +1,5 @@
-/* 
-   Local site variables to adjust look n' feel of what is displayed on the 
+/*
+   Local site variables to adjust look n' feel of what is displayed on the
    'static' html pages with javascript content loading on this site.
 
    IMPORTANT: ui doubles as status.erda.dk so we should only display production
@@ -13,7 +13,7 @@ function get_site_conf(key) {
         /* We keep IDMC for history */
         value = ["ALL", "ERDA", "SIF", "MiGrid", "IDMC"];
     } else if (key === 'auth_methods') {
-        value = ["extoid", "extoidc", "migoid", "extcert"];
-    } 
+        value = ["extoidc", "migoid", "extcert"];
+    }
     return value;
 }
diff --git a/mig/images/site-conf-storage.deic.dk.js b/mig/images/site-conf-storage.deic.dk.js
@@ -1,5 +1,5 @@
-/* 
-   Local site variables to adjust look n' feel of what is displayed on the 
+/*
+   Local site variables to adjust look n' feel of what is displayed on the
    'static' html pages with javascript content loading on this site.
 
 */
@@ -11,6 +11,6 @@ function get_site_conf(key) {
         value = ["ALL", "DeiC"];
     } else if (key === 'auth_methods') {
         value = ["extoidc", "migoid"];
-    } 
+    }
     return value;
 }
diff --git a/mig/images/site-conf-test-sif.erda.dk.js b/mig/images/site-conf-test-sif.erda.dk.js
@@ -1,5 +1,5 @@
-/* 
-   Local site variables to adjust look n' feel of what is displayed on the 
+/*
+   Local site variables to adjust look n' feel of what is displayed on the
    'static' html pages with javascript content loading on this site.
 
 */
@@ -11,6 +11,6 @@ function get_site_conf(key) {
         value = ["ALL", "SIF", "TEST.SIF"];
     } else if (key === 'auth_methods') {
         value = ["extoid", "migoid"];
-    } 
+    }
     return value;
 }
diff --git a/mig/images/site-conf-test.erda.dk.js b/mig/images/site-conf-test.erda.dk.js
@@ -10,7 +10,7 @@ function get_site_conf(key) {
     } else if (key === 'system_match') {
         value = ["ALL", "ERDA", "TEST.ERDA"];
     } else if (key === 'auth_methods') {
-        value = ["extoid", "extoidc", "migoid", "extcert"];
+        value = ["extoidc", "migoid", "extcert"];
     }
     return value;
 }
diff --git a/mig/images/site-conf-test.idmc.dk.js b/mig/images/site-conf-test.idmc.dk.js
@@ -1,5 +1,5 @@
-/* 
-   Local site variables to adjust look n' feel of what is displayed on the 
+/*
+   Local site variables to adjust look n' feel of what is displayed on the
    'static' html pages with javascript content loading on this site.
 
 */
@@ -9,6 +9,8 @@ function get_site_conf(key) {
         value = "status-events.json";
     } else if (key === 'system_match') {
         value = ["ALL", "IDMC", "TEST.IDMC"];
-    } 
+    } else if (key === 'auth_methods') {
+        value = ["extoidc", "migoid", "extcert"];
+    }
     return value;
 }
diff --git a/mig/install/migerrors-template.sh.cronjob b/mig/install/migerrors-template.sh.cronjob
@@ -29,21 +29,21 @@ MAXLINES=1000
 grep -H "Internal Server Error" $LOGDIR/webdavs.out | tail -n $MAXLINES
 grep -H -A 12 "Traceback" $LOGDIR/webdavs.out | tail -n $MAXLINES
 
-grep -H ERROR $LOGDIR/ftps.log | \
+grep -H " ERROR " $LOGDIR/ftps.log | \
         grep -E -v "ERROR Invalid user(name)? .* from ${SECSCANIP}|Invalid username [a-zA-Z0-9._-]* from|ERROR Account disabled or expired" | tail -n $MAXLINES
 
-grep -H ERROR $LOGDIR/sftp*.log | \
+grep -H " ERROR " $LOGDIR/sftp*.log | \
 	grep -E -v "Password authentication failed for|Socket exception: Connection reset by peer|Error reading SSH protocol banner|check_banner|list_folder on missing path|chmod (292|365) rejected on path|symlink rejected on path|ERROR mkdir .* failed: \[Errno 17\] File exists|ERROR rmdir .* failed: \[Errno 39\] Directory not empty|ERROR open .* failed: \[Errno 21\] Is a directory|ERROR open for modify on read-only path|ERROR open existing file on missing path |ERROR Exception.*: Incompatible ssh|ERROR Exception.*: Incompatible version |Exception.*: Invalid SSH banner|ERROR Exception.*: no moduli available|ERROR Exception.*: Expecting packet from \(20,\), got 0|ERROR Socket exception: Connection timed out|ERROR Exception.*: Key-exchange timed out|ERROR Invalid user(name)? .* from ${SECSCANIP}|Invalid username [a-zA-Z0-9._-]* from|ERROR Account disabled or expired|ERROR Exception.*: Client kex .* is out of range|ERROR Exception.*: Expecting packet from .*|ERROR $" | tail -n $MAXLINES
 
-grep -H ERROR $LOGDIR/davs.log | grep -E -v "The handshake operation timed out|decryption failed or bad record mac|length too short|no ciphers specified|(unknown error|parse tlsext|https proxy request) \(_ssl.c:\)|SSL/TLS wrap of .* failed unexpectedly:|Failed password login for .* from ${SECSCANIP}|ERROR Invalid user(name)? .* from ${SECSCANIP}|Invalid username [a-zA-Z0-9._-]* from|ERROR Account disabled or expired|invalid share mode (write|read)-only for " | tail -n $MAXLINES
+grep -H " ERROR " $LOGDIR/davs.log | grep -E -v "The handshake operation timed out|decryption failed or bad record mac|length too short|no ciphers specified|(unknown error|parse tlsext|https proxy request) \(_ssl.c:\)|SSL/TLS wrap of .* failed unexpectedly:|Failed password login for .* from ${SECSCANIP}|ERROR Invalid user(name)? .* from ${SECSCANIP}|Invalid username [a-zA-Z0-9._-]* from|ERROR Account disabled or expired|invalid share mode (write|read)-only for " | tail -n $MAXLINES
 
-grep -H ERROR $LOGDIR/chkchroot.log | grep -E -v " from ${SECSCANIP} "| \
+grep -H " ERROR " $LOGDIR/chkchroot.log | grep -E -v " from ${SECSCANIP} "| \
         grep -E -v "__CRACK_WEB_REGEX__" | \
         grep -E -v "/index\.html$|/state/webserver_home/share_redirect$" | \
         tail -n $MAXLINES
 
 # NOTE: we ignore script crashed errors here and treat specifically next
-grep -H ERROR $LOGDIR/mig.log | \
+grep -H " ERROR " $LOGDIR/mig.log | \
 	grep -E -v "problems importing arclib|disabled in configuration|(settings|userprofile) could not be opened/unpickled|load (ssh|ftps|davs|seafile) publickeys failed|is not a valid openid provider|script crashed:|INFO Content-Length missing or zero|${SECSCANIP} (refused to|could not) import .*shared\.functionality\.|INFO Not available on this site.*Replied .ERROR.|: failed on .*: .*\[Errno 2\] No such file or directory: |: failed on .*: .*\[Errno 17\] File exists: |create directory failed: .*\[Errno 17\] File exists:|refusing rm link: .*/user_home/.*/Trash" | tail -n $MAXLINES
 # Extract variable length script crash tracebacks terminated with a blank line
 sed -n "/ERROR.* script crashed:/""{ :a; $p; N; /\n$/!ba; p; }" $LOGDIR/mig.log | tail -n $MAXLINES
