From 73ccabf060947b66ada0e1ee02261567bba0ff70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=85kre=20Solberg?= <andreas.solberg@uninett.no>
Date: Thu, 7 Feb 2008 09:29:33 +0000
Subject: [PATCH] Tidying frontpage code, as well as checking whether user is
running ssp on https, and if not give a warning on the frontpage
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@258 44740490-163a-0410-bde0-09ae8108e29a
---
docs/source/simplesamlphp-sp.xml | 2 +-
lib/SimpleSAML/Utilities.php | 18 +++++++------
templates/default/en/frontpage.php | 14 ++++++++++-
www/index.php | 39 ++++++++++++++++++++++-------
www/resources/default.css | 9 +++++++
www/resources/icons/caution.png | Bin 0 -> 2369 bytes
6 files changed, 63 insertions(+), 19 deletions(-)
create mode 100755 www/resources/icons/caution.png
diff --git a/docs/source/simplesamlphp-sp.xml b/docs/source/simplesamlphp-sp.xml
index 35a05fa86..ad82586a9 100644
--- a/docs/source/simplesamlphp-sp.xml
+++ b/docs/source/simplesamlphp-sp.xml
@@ -7,7 +7,7 @@
<articleinfo>
<date>2007-10-15</date>
- <pubdate>Fri Feb 1 08:44:40 2008</pubdate>
+ <pubdate>Wed Feb 6 14:26:51 2008</pubdate>
<author>
<firstname>Andreas Ă…kre</firstname>
diff --git a/lib/SimpleSAML/Utilities.php b/lib/SimpleSAML/Utilities.php
index 822a97ddd..068428bb9 100644
--- a/lib/SimpleSAML/Utilities.php
+++ b/lib/SimpleSAML/Utilities.php
@@ -25,19 +25,19 @@ class SimpleSAML_Utilities {
return $currenthost;
}
+ public static function getSelfProtocol() {
+ $s = empty($_SERVER["HTTPS"]) ? ''
+ : ($_SERVER["HTTPS"] == "on") ? "s"
+ : "";
+ $protocol = self::strleft(strtolower($_SERVER["SERVER_PROTOCOL"]), "/").$s;
+ return $protocol;
+ }
public static function selfURLhost() {
$currenthost = self::getSelfHost();
- $s = empty($_SERVER["HTTPS"]) ? ''
- : ($_SERVER["HTTPS"] == "on") ? "s"
- : "";
- $protocol = self::strleft(strtolower($_SERVER["SERVER_PROTOCOL"]), "/").$s;
-
- $port = ($_SERVER["SERVER_PORT"] == "80") ? ""
- : (":".$_SERVER["SERVER_PORT"]);
-
+ $protocol = self::getSelfProtocol();
$portnumber = $_SERVER["SERVER_PORT"];
$port = ':' . $portnumber;
@@ -51,6 +51,8 @@ class SimpleSAML_Utilities {
return $protocol."://" . $currenthost . $port;
}
+
+
public static function selfURLNoQuery() {
diff --git a/templates/default/en/frontpage.php b/templates/default/en/frontpage.php
index a4279a02e..bc2ff455f 100644
--- a/templates/default/en/frontpage.php
+++ b/templates/default/en/frontpage.php
@@ -11,12 +11,24 @@
<ul>
<?php
- foreach ($data['links'] AS $link) {
+ foreach ($this->data['links'] AS $link) {
echo '<li><a href="' . htmlspecialchars($link['href']) . '">' . htmlspecialchars($link['text']) . '</a></li>';
}
?>
</ul>
</p>
+ <?php
+
+ foreach($this->data['warnings'] AS $warning) {
+
+
+ echo '<div class="caution">' . $warning . '</div>';
+
+
+
+ }
+
+ ?>
diff --git a/www/index.php b/www/index.php
index 449e72ec2..9f756764e 100644
--- a/www/index.php
+++ b/www/index.php
@@ -2,14 +2,12 @@
require_once('_include.php');
-
require_once('SimpleSAML/Utilities.php');
require_once('SimpleSAML/Session.php');
require_once('SimpleSAML/XHTML/Template.php');
require_once('SimpleSAML/Metadata/MetaDataStorageHandler.php');
-
/* Load simpleSAMLphp, configuration */
$config = SimpleSAML_Configuration::getInstance();
$session = SimpleSAML_Session::getInstance(true);
@@ -24,32 +22,55 @@ if ($config->getValue('admin.protectindexpage', false)) {
}
+$warnings = array();
+
+if (SimpleSAML_Utilities::getSelfProtocol() != 'https') {
+ $warnings[] = '<strong>You are not using HTTPS</strong> - encrypted communication with the user. Using simpleSAMLphp will works perfectly fine on HTTP for test purposes, but if you will be using simpleSAMLphp in a production environment, you should be running it on HTTPS.';
+}
+
+
+
$links = array();
-$links[] = array('href' => 'admin/metadata.php', 'text' => 'Meta data overview for your installation. Diagnose your meta data files.');
+$links[] = array(
+ 'href' => 'admin/metadata.php',
+ 'text' => 'Meta data overview for your installation. Diagnose your meta data files.');
if ($config->getValue('enable.saml20-sp') === true)
- $links[] = array('href' => 'saml2/sp/metadata.php', 'text' => 'SAML 2.0 Service Provider Metadata (automatically generated)');
+ $links[] = array(
+ 'href' => 'saml2/sp/metadata.php',
+ 'text' => 'SAML 2.0 Service Provider Metadata (automatically generated)');
if ($config->getValue('enable.saml20-sp') === true)
- $links[] = array('href' => 'example-simple/saml2-example.php', 'text' => 'SAML 2.0 SP example - test logging in through your IdP');
+ $links[] = array(
+ 'href' => 'example-simple/saml2-example.php',
+ 'text' => 'SAML 2.0 SP example - test logging in through your IdP');
if ($config->getValue('enable.saml20-idp') === true)
- $links[] = array('href' => 'saml2/idp/metadata.php', 'text' => 'SAML 2.0 Identity Provider Metadata (automatically generated)');
+ $links[] = array(
+ 'href' => 'saml2/idp/metadata.php',
+ 'text' => 'SAML 2.0 Identity Provider Metadata (automatically generated)');
if ($config->getValue('enable.shib13-sp') === true)
- $links[] = array('href' => 'example-simple/shib13-example.php', 'text' => 'Shibboleth 1.3 SP example - test logging in through your Shib IdP');
+ $links[] = array(
+ 'href' => 'example-simple/shib13-example.php',
+ 'text' => 'Shibboleth 1.3 SP example - test logging in through your Shib IdP');
if ($config->getValue('enable.openid-provider') === true)
- $links[] = array('href' => 'openid/provider/server.php', 'text' => 'OpenID Provider site - Alpha version (test code)');
+ $links[] = array(
+ 'href' => 'openid/provider/server.php',
+ 'text' => 'OpenID Provider site - Alpha version (test code)');
-$links[] = array('href' => 'example-simple/hostnames.php', 'text' => 'Diagnostics on hostname, port and protocol');
+$links[] = array(
+ 'href' => 'example-simple/hostnames.php',
+ 'text' => 'Diagnostics on hostname, port and protocol');
$t = new SimpleSAML_XHTML_Template($config, 'frontpage.php');
$t->data['header'] = 'simpleSAMLphp installation page';
$t->data['icon'] = 'compass_l.png';
+$t->data['warnings'] = $warnings;
$t->data['links'] = $links;
$t->show();
diff --git a/www/resources/default.css b/www/resources/default.css
index f6830d909..e82beee15 100644
--- a/www/resources/default.css
+++ b/www/resources/default.css
@@ -90,4 +90,13 @@ dl dd {
padding: .4em;
font-family: monospace;
font-size: large;
+}
+div.caution {
+ background-color: #FF9;
+ background-image: url('icons/caution.png');
+ background-repeat: no-repeat;
+
+ border: thin solid #444;
+ padding: .2em .2em .2em 60px;
+ margin: 1em 0px 1em 0p;
}
\ No newline at end of file
diff --git a/www/resources/icons/caution.png b/www/resources/icons/caution.png
new file mode 100755
index 0000000000000000000000000000000000000000..e3897db8771158c562faec8dfa675633ba677007
GIT binary patch
literal 2369
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
literal 0
HcmV?d00001
--
GitLab