Merge pull request #1554 from simplesamlphp/feature/minimal-frontpage

Minimal frontpage

config-templates/config.php

@@ -143,10 +143,8 @@ $config = [
     'auth.adminpassword' => '123',
 
     /*
-     * Set this options to true if you want to require administrator password to access the web interface
-     * or the metadata pages, respectively.
+     * Set this option to true if you want to require administrator password to access the metadata.
      */
-    'admin.protectindexpage' => false,
     'admin.protectmetadata' => false,
 
     /*
@@ -860,6 +858,12 @@ $config = [
         ],
     ],
 
+    /**
+     * Set to a full URL if you want to redirect users that land on SimpleSAMLphp's
+     * front page to somewhere more useful. If left unset, a basic welcome message
+     * is shown.
+     */
+    //'frontpage.redirect' => 'https://example.com/',
 
     /*********************
      | DISCOVERY SERVICE |

docs/simplesamlphp-upgrade-notes-2.0.md

@@ -42,6 +42,7 @@ deprecated `strftime()` format to PHP's `date()` format.
 Configuration options that have been removed:
  - languages[priorities]
  - attributes.extradictionaries. Add an attributes.po to your configured theme instead.
+ - admin.protectindexpage. Replaced by the admin module which always requires login.
 
 Changes relevant for (module) developers
 ----------------------------------------

lib/SimpleSAML/Utils/Auth.php

@@ -16,25 +16,6 @@ use SimpleSAML\Session;
  */
 class Auth
 {
-    /**
-     * Retrieve an admin login URL.
-     *
-     * @param string|NULL $returnTo The URL the user should arrive on after admin authentication. Defaults to null.
-     *
-     * @return string A URL which can be used for admin authentication.
-     * @throws \InvalidArgumentException If $returnTo is neither a string nor null.
-     */
-    public function getAdminLoginURL(?string $returnTo = null): string
-    {
-        $httpUtils = new HTTP();
-        if ($returnTo === null) {
-            $returnTo = $httpUtils->getSelfURL();
-        }
-
-        return Module::getModuleURL('core/login-admin.php', ['ReturnTo' => $returnTo]);
-    }
-
-
     /**
      * Retrieve an admin logout URL.
      *

modules/admin/locales/ar/LC_MESSAGES/admin.po

@@ -271,6 +271,10 @@ msgid ""
 "simplesamlphp-maintenance\">Read more about the maintenance of "
 "SimpleSAMLphp</a>."
 msgstr ""
+"<strong>انت لا تستخدم HTTPS</strong> - محادثة مشفرة مع المستخدم. HTTP جيد"
+" للاختبارات لكن في بيئة النظام المبدئي ينبغي استخدام HTTPS. [ <a "
+"href=\"https://simplesamlphp.org/docs/stable/simplesamlphp-maintenance"
+"\">read more about SimpleSAMLphp maintenance</a>]"
 
 msgid ""
 "<strong>The configuration uses the default secret salt</strong>. Make sure "

modules/admin/locales/cs/LC_MESSAGES/admin.po

@@ -271,6 +271,10 @@ msgid ""
 "simplesamlphp-maintenance\">Read more about the maintenance of "
 "SimpleSAMLphp</a>."
 msgstr ""
+"<strong>Nepoužíváte HTTPS</strong> - šivrovanou komunikaci s uživatelem. "
+"HTTP je vhodné jen k testovacím účelům, pro produkční účely použijte "
+"HTTPS. [ <a href=\"https://simplesamlphp.org/docs/stable/simplesamlphp-maintenance"
+"\">Čtete více o údržbě SimpleSAMLphp</a> ]"
 
 msgid ""
 "<strong>The configuration uses the default secret salt</strong>. Make sure "

modules/admin/locales/da/LC_MESSAGES/admin.po

@@ -271,6 +271,12 @@ msgid ""
 "simplesamlphp-maintenance\">Read more about the maintenance of "
 "SimpleSAMLphp</a>."
 msgstr ""
+"<strong>Du benytter ikke HTTPS</strong>-krypteret kommunikation med "
+"brugeren. SimpleSAMLphp vil fungere uden problemer med HTTP alene, men "
+"hvis du anvender systemet i produktionssystemer, anbefales det stærkt at "
+"benytte sikker kommunikation i form af HTTPS. [ <a "
+"href=\"https://simplesamlphp.org/docs/stable/simplesamlphp-maintenance"
+"\">læs mere i dokumentet: SimpleSAMLphp maintenance</a> ] "
 
 msgid ""
 "<strong>The configuration uses the default secret salt</strong>. Make sure "
@@ -279,6 +285,10 @@ msgid ""
 "org/docs/stable/simplesamlphp-install\">Read more about the maintenance of "
 "SimpleSAMLphp</a>."
 msgstr ""
+"<strong>Opsætningen benytter standard 'secret salt'</strong> - sørg for "
+"at ændre standard indstillingen for 'secretsalt' i simpleSAML opsætningen"
+" i produktionssystemer. [<a href=\"https://simplesamlphp.org/docs/stable"
+"/simplesamlphp-install\">Læs mere om SimpleSAMLphp opsætning.</a> ]"
 
 msgid ""
 "The cURL PHP extension is missing. Cannot check for SimpleSAMLphp updates."

modules/admin/locales/de/LC_MESSAGES/admin.po

@@ -271,6 +271,12 @@ msgid ""
 "simplesamlphp-maintenance\">Read more about the maintenance of "
 "SimpleSAMLphp</a>."
 msgstr ""
+"<strong>Sie benutzen keine HTTPS</strong> - verschlüsselte Kommunikation "
+"mit dem Nutzer. SimpleSAMLphp funktioniert zum Testen auch mit HTTP "
+"problemlos, aber in einer Produktionsumgebung sollten Sie HTTPS benutzen."
+" [ <a href=\"https://simplesamlphp.org/docs/stable/simplesamlphp-maintenance"
+"\">Lesen sie mehr über die Verwaltung von SimpleSAMLphp</a> "
+"]"
 
 msgid ""
 "<strong>The configuration uses the default secret salt</strong>. Make sure "

modules/admin/locales/el/LC_MESSAGES/admin.po

@@ -272,6 +272,11 @@ msgid ""
 "simplesamlphp-maintenance\">Read more about the maintenance of "
 "SimpleSAMLphp</a>."
 msgstr ""
+"Δεν χρησιμοποιείτε <strong>HTTPS</strong> για κρυπτογραφημένη επικοινωνία"
+" με τον χρήστη. Το HTTP επαρκεί για δοκιμαστικούς σκοπούς, ωστόσο σε "
+"περιβάλλον παραγωγής θα πρέπει να χρησιμοποιήσετε HTTPS. [ <a "
+"href=\"https://simplesamlphp.org/docs/stable/simplesamlphp-maintenance"
+"\">Διαβάστε περισσότερα...</a> ]"
 
 msgid ""
 "<strong>The configuration uses the default secret salt</strong>. Make sure "
@@ -280,6 +285,11 @@ msgid ""
 "org/docs/stable/simplesamlphp-install\">Read more about the maintenance of "
 "SimpleSAMLphp</a>."
 msgstr ""
+"<strong>Χρησιμοποιείτε την προεπιλεγμένη τιμή του μυστικού κλειδιού "
+"(salt)</strong> - φροντίστε να τροποποιήσετε την παράμετρο 'secretsalt' "
+"στις ρυθμίσεις του SimpleSAMLphp σε περιβάλλον παραγωγής. [<a "
+"href=\"https://simplesamlphp.org/docs/stable/simplesamlphp-"
+"install\">Διαβάστε περισσότερα...</a> ]"
 
 msgid ""
 "The cURL PHP extension is missing. Cannot check for SimpleSAMLphp updates."

modules/admin/locales/en/LC_MESSAGES/admin.po

@@ -21,7 +21,7 @@ msgid "Deprecated"
 msgstr "Deprecated"
 
 msgid "SimpleSAMLphp installation page"
-msgstr ""
+msgstr "SimpleSAMLphp installation page"
 
 msgid "SimpleSAMLphp is installed in:"
 msgstr ""
@@ -30,10 +30,10 @@ msgid "You are running version <kbd>%version%</kbd>."
 msgstr ""
 
 msgid "Configuration"
-msgstr ""
+msgstr "Configuration"
 
 msgid "Checking your PHP installation"
-msgstr ""
+msgstr "Checking your PHP installation"
 
 msgid "required"
 msgstr ""
@@ -45,7 +45,7 @@ msgid "SimpleSAMLphp Show Metadata"
 msgstr ""
 
 msgid "Metadata"
-msgstr ""
+msgstr "Metadata"
 
 msgid "Copy to clipboard"
 msgstr ""
@@ -87,7 +87,7 @@ msgid "expires"
 msgstr ""
 
 msgid "Tools"
-msgstr ""
+msgstr "Tools"
 
 msgid "Look up metadata for entity:"
 msgstr ""
@@ -123,7 +123,7 @@ msgid "new"
 msgstr ""
 
 msgid "Diagnostics on hostname, port and protocol"
-msgstr ""
+msgstr "Diagnostics on hostname, port and protocol"
 
 msgid ""
 "Hi, this is the status page of SimpleSAMLphp. Here you can see if your "
@@ -166,7 +166,7 @@ msgid "Test"
 msgstr ""
 
 msgid "Federation"
-msgstr ""
+msgstr "Federation"
 
 msgid "Information on your PHP installation"
 msgstr ""
@@ -271,6 +271,11 @@ msgid ""
 "simplesamlphp-maintenance\">Read more about the maintenance of "
 "SimpleSAMLphp</a>."
 msgstr ""
+"<strong>You are not using HTTPS</strong> to protect communications with your "
+"users. HTTP works fine for testing purposes, but in a production environment "
+"you should use HTTPS. <a href=\"https://simplesamlphp.org/docs/stable/"
+"simplesamlphp-maintenance\">Read more about the maintenance of "
+"SimpleSAMLphp</a>."
 
 msgid ""
 "<strong>The configuration uses the default secret salt</strong>. Make sure "
@@ -279,6 +284,11 @@ msgid ""
 "org/docs/stable/simplesamlphp-install\">Read more about the maintenance of "
 "SimpleSAMLphp</a>."
 msgstr ""
+"<strong>The configuration uses the default secret salt</strong>. Make sure "
+"to modify the <code>secretsalt</code> option in the SimpleSAMLphp "
+"configuration in production environments. <a href=\"https://simplesamlphp."
+"org/docs/stable/simplesamlphp-install\">Read more about the maintenance of "
+"SimpleSAMLphp</a>."
 
 msgid ""
 "The cURL PHP extension is missing. Cannot check for SimpleSAMLphp updates."
@@ -288,9 +298,11 @@ msgid ""
 "You are running an outdated version of SimpleSAMLphp. Please update to <a "
 "href=\"%latest%\">the latest version</a> as soon as possible."
 msgstr ""
+"You are running an outdated version of SimpleSAMLphp. Please update to <a "
+"href=\"%latest%\">the latest version</a> as soon as possible."
 
 msgid "XML to SimpleSAMLphp metadata converter"
-msgstr ""
+msgstr "XML to SimpleSAMLphp metadata converter"
 
 msgid "SAML 2.0 SP metadata"
 msgstr ""

modules/admin/locales/es/LC_MESSAGES/admin.po

@@ -271,6 +271,11 @@ msgid ""
 "simplesamlphp-maintenance\">Read more about the maintenance of "
 "SimpleSAMLphp</a>."
 msgstr ""
+"<strong>No está usando HTTPS</strong> - comunicaciones cifradas con el "
+"usuario. HTTP funciona bien en entornos de evaluación, pero si va a "
+"emplearlo en producción, debería emplear HTTPS. [ <a "
+"href=\"https://simplesamlphp.org/docs/stable/simplesamlphp-"
+"maintenance\">Lea más acerca del mantenimiento de SimpleSAMLphp </a> ]"
 
 msgid ""
 "<strong>The configuration uses the default secret salt</strong>. Make sure "
@@ -279,6 +284,11 @@ msgid ""
 "org/docs/stable/simplesamlphp-install\">Read more about the maintenance of "
 "SimpleSAMLphp</a>."
 msgstr ""
+"<strong>Su configuraci&oacute;n est&aacute; usando el <em>salt</em> por "
+"defecto</strong>. Aseg&uacute;rese de modificar la opci&oacute;n de "
+"configuraci&oacute;n 'secretsalt' en entornos de producci&oacute;n. [<a "
+"href=\"https://simplesamlphp.org/docs/devel/simplesamlphp-install\">Leer "
+"m&aacute;s sobre la configuraci&oacute;n de SimpleSAMLphp</a>]"
 
 msgid ""
 "The cURL PHP extension is missing. Cannot check for SimpleSAMLphp updates."
@@ -288,6 +298,9 @@ msgid ""
 "You are running an outdated version of SimpleSAMLphp. Please update to <a "
 "href=\"%latest%\">the latest version</a> as soon as possible."
 msgstr ""
+"Su instalaci&oacute;n de SimpleSAMLphp est&aacute; desactualizada. Por "
+"favor, actualice a la <a href=\"%latest%\">&uacute;ltima "
+"versi&oacute;n</a> lo antes posible."
 
 msgid "XML to SimpleSAMLphp metadata converter"
 msgstr "Conversor de XML a metadatos de SimpleSAMLphp"

modules/admin/locales/et/LC_MESSAGES/admin.po

@@ -271,6 +271,11 @@ msgid ""
 "simplesamlphp-maintenance\">Read more about the maintenance of "
 "SimpleSAMLphp</a>."
 msgstr ""
+"<strong>Sa ei kasuta andmete vahetamiseks HTTPS krüpteeritud "
+"sidet</strong>. HTTP sobib testimiseks hästi, kuid toodangus peaksid "
+"kindlasti HTTPS-i kasutama. [ <a href=\"http://rnd.feide.no/content"
+"/simplesamlphp-maintenance-and-configuration\">Loe täpsemalt "
+"SimpleSAMLphp hooldamisest</a> ]"
 
 msgid ""
 "<strong>The configuration uses the default secret salt</strong>. Make sure "

modules/admin/locales/eu/LC_MESSAGES/admin.po

@@ -271,6 +271,12 @@ msgid ""
 "simplesamlphp-maintenance\">Read more about the maintenance of "
 "SimpleSAMLphp</a>."
 msgstr ""
+"<strong>Ez zara erabiltzen ari HTTPSak</strong> - erabiltzailearekin "
+"zifratutako komunikazioak. HTTP zuzen ibiltzen da ebaluaketa ingurunetan,"
+" baina ustiapenean erabili behar baduzu, HTTPS erabili beharko zenuke. [ "
+"<a href=\"https://simplesamlphp.org/docs/stable/simplesamlphp-maintenance"
+"\">Irakur ezazu gehiago SimpleSAMLphp-ren mantentze-lanei "
+"buruz </a> ]"
 
 msgid ""
 "<strong>The configuration uses the default secret salt</strong>. Make sure "

modules/admin/locales/fi/LC_MESSAGES/admin.po

@@ -271,6 +271,10 @@ msgid ""
 "simplesamlphp-maintenance\">Read more about the maintenance of "
 "SimpleSAMLphp</a>."
 msgstr ""
+"<strong>Et käytä HTTPS</strong> - vahvaa yhteystä käyttäjään. HTTP-"
+"protokolla on sopiva testeihin, mutta tuotantojärjestelmässä sinun tulee "
+"käyttää HTTPS:ää. [ <a href=\"http://rnd.feide.no/content/simplesamlphp-"
+"maintenance-and-configuration\">Lue SimpleSAMLphp ylläpidosta (eng)</a> ]"
 
 msgid ""
 "<strong>The configuration uses the default secret salt</strong>. Make sure "

modules/admin/locales/fr/LC_MESSAGES/admin.po

@@ -271,6 +271,12 @@ msgid ""
 "simplesamlphp-maintenance\">Read more about the maintenance of "
 "SimpleSAMLphp</a>."
 msgstr ""
+"<strong>Vous n'utilisez pas HTTPS</strong> - communications chiffrées "
+"avec l'utilisateur.  Utiliser SimpleSAMLphp marchera parfaitement avec "
+"HTTP pour des tests, mais si vous voulez l'utiliser dans un environnement"
+" de production, vous devriez utiliser HTTPS. [  <a "
+"href=\"https://simplesamlphp.org/docs/stable/simplesamlphp-maintenance"
+"\">En lire plus sur la maintenance de SimpleSAMLphp</a> ]"
 
 msgid ""
 "<strong>The configuration uses the default secret salt</strong>. Make sure "

modules/admin/locales/he/LC_MESSAGES/admin.po

@@ -271,6 +271,10 @@ msgid ""
 "simplesamlphp-maintenance\">Read more about the maintenance of "
 "SimpleSAMLphp</a>."
 msgstr ""
+"<strong>אתה לא משתמש ב- HTTPS </strong> - התקשרות מוצפנת עם המשתמש. HTTP "
+"עובד בסדר למטרות בדיקה, אולם למערכות אמיתיות, כדי להשתמש ה HTTPS. [ <a "
+"href=\"https://simplesamlphp.org/docs/stable/simplesamlphp-maintenance"
+"\"> קרא עוד על תחזוק SimpleSAMLphp </a> ]"
 
 msgid ""
 "<strong>The configuration uses the default secret salt</strong>. Make sure "

modules/admin/locales/hr/LC_MESSAGES/admin.po

@@ -271,6 +271,11 @@ msgid ""
 "simplesamlphp-maintenance\">Read more about the maintenance of "
 "SimpleSAMLphp</a>."
 msgstr ""
+"<strong>Ne koristite HTTPS</strong> - kriptiranu komunikaciju s "
+"korisnikom. HTTP se može koristiti za potrebe testiranja, ali u "
+"produkcijskom okruženju trebali biste koristiti HTTPS. [ <a "
+"href=\"https://simplesamlphp.org/docs/stable/simplesamlphp-maintenance"
+"\">Pročitajte više o SimpleSAMLphp postavkama</a> ]"
 
 msgid ""
 "<strong>The configuration uses the default secret salt</strong>. Make sure "

modules/admin/locales/hu/LC_MESSAGES/admin.po

@@ -271,6 +271,11 @@ msgid ""
 "simplesamlphp-maintenance\">Read more about the maintenance of "
 "SimpleSAMLphp</a>."
 msgstr ""
+"<strong>Nem HTTPS protokollt használ</strong> - nem titkosított a "
+"kommunikáció! HTTP jó megoldás lehet teszt rendszerek esetében, de az "
+"éles rendszerben lehetőség szerint használjon HTTPS-t! [ <a "
+"href=\"https://simplesamlphp.org/docs/stable/simplesamlphp-maintenance"
+"\">Többet olvashat a SimpleSAMLphp beállításáról</a> ]"
 
 msgid ""
 "<strong>The configuration uses the default secret salt</strong>. Make sure "

modules/admin/locales/id/LC_MESSAGES/admin.po

@@ -271,6 +271,12 @@ msgid ""
 "simplesamlphp-maintenance\">Read more about the maintenance of "
 "SimpleSAMLphp</a>."
 msgstr ""
+"<strong>Anda tidak menggunakan HTTPS</strong> - komunikasi yang "
+"dienkripsi dengan user. HTTP bekerja baik-baik saja untuk tujuan "
+"pengetesan , tapi dalam lingkungan produksi, Anda sebaiknya menggunakan "
+"HTTPS. [ <a href=\"https://simplesamlphp.org/docs/stable/simplesamlphp-maintenance"
+"\">Baca lebih lanjut tentang proses pemeliraan "
+"SimpleSAMLphp.</a> ]"
 
 msgid ""
 "<strong>The configuration uses the default secret salt</strong>. Make sure "

modules/admin/locales/it/LC_MESSAGES/admin.po

@@ -271,6 +271,12 @@ msgid ""
 "simplesamlphp-maintenance\">Read more about the maintenance of "
 "SimpleSAMLphp</a>."
 msgstr ""
+"<strong>Non stai usando HTTPS</strong> - comunicazione cifrata con "
+"l'utente. HTTP pu&ograve; funzionare per i test, ma in un ambiente di "
+"produzione si dovrebbe usare HTTPS. [ <a "
+"href=\"https://simplesamlphp.org/docs/stable/simplesamlphp-maintenance"
+"\">Maggiori informazioni sulla manutenzione di "
+"SimpleSAMLphp</a> ]"
 
 msgid ""
 "<strong>The configuration uses the default secret salt</strong>. Make sure "

modules/admin/locales/ja/LC_MESSAGES/admin.po

@@ -271,6 +271,9 @@ msgid ""
 "simplesamlphp-maintenance\">Read more about the maintenance of "
 "SimpleSAMLphp</a>."
 msgstr ""
+"<strong>あなたはHTTPS(暗号化通信)を行っていません。</strong>HTTPはテスト環境であれば正常に動作します、しかし製品環境ではHTTPSを使用するべきです。["
+" <a href=\"https://simplesamlphp.org/docs/stable/simplesamlphp-maintenance"
+"\">詳しくはSimpleSAMLphpメンテナンス情報を読んでください</a> ]"
 
 msgid ""
 "<strong>The configuration uses the default secret salt</strong>. Make sure "
@@ -279,6 +282,8 @@ msgid ""
 "org/docs/stable/simplesamlphp-install\">Read more about the maintenance of "
 "SimpleSAMLphp</a>."
 msgstr ""
+"<strong>デフォルトのシークレットソルトが使われています</strong> - プロダクションでsimpleSAMLを使用される場合はデフォルトの「secretsalt」オプションを必ず変更してください。"
+"[<a href=\"https://simplesamlphp.org/docs/stable/simplesamlphp-install\">SimpleSAMLphpの設定についてはこちら</a> ]"
 
 msgid ""
 "The cURL PHP extension is missing. Cannot check for SimpleSAMLphp updates."
@@ -287,7 +292,7 @@ msgstr ""
 msgid ""
 "You are running an outdated version of SimpleSAMLphp. Please update to <a "
 "href=\"%latest%\">the latest version</a> as soon as possible."
-msgstr ""
+msgstr "旧バージョンのSimpleSAMLphpが使われています。できるだけ早く<a href=\"%latest%\">最新バーション</a>にアップロードしてください"
 
 msgid "XML to SimpleSAMLphp metadata converter"
 msgstr "XMLをSimpleSAMLphpメタデータに変換"