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
zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4mJh`hH$2z?F<YIY)RhkE)4%caKYZ?lNlHo
zI14-?iy0WWg+Q3`(%rg03=9nHC7!;n?3X!&_+-Sol&^kbU|_H-ag8W(&d<$F%`0JW
zE=o--Nlj5G&n(GM2+2rQaQE~L;NsFq)>JSuFfdl|O3W@zQc%yz%*{<qR#ylvNzKel
zEmAjrAHl%D(c<ai7*cWT?ab<ekgKxC?aR$My-&2cFJL^R{b@?nf&({{I+&VTjWPs-
zC8E+_Ik?U(w3@4x-0qbAtH49{UcXV4s{@O*uYA(&A2YHRGIF^Iwg|MDPfBn)l(u>I
z$#;97f9bD&_wMFtwVNJWEDq1LEdD-k@AEtFzkmPzukLyI`^M<wYad_xIMuF4KjWUA
z!@jaw))l{22}tmXFcxpwCwyRj!~T13<Z1;n*iyLPJ~uc1vD0CT=m)>*Z)q(54HQZi
z9OnA`blFt@la`m?dAKIMJj+sNCvch3&Y*TnPmI>oXFp>vt<jw9U2mf*+PU2N(ZhSv
zGW!K?@TFMD-k)vQb~n2Fqnp+N9;Y8nm*4H}_DGgZm7jP0xF5Td!_EKQ2b2$l)%H~y
zAOCdgwD!jqEe9^1%*HJW*A8sa6y{)Gzv=(t?q4#-4GJ6npH}-|u)$eA-lW=Q{k|VE
z^8#4gL=@IqFgiyGa2MRavYUf7>t_9v;M#S+8yN~7oL1VvQNjAbLYDj4os-*i_aD3+
z!5C3d#dGMxQwKM7o7gHP<#5MY33184rgXBrwtsx!cxax`^@iqnlg8r>x>i3bjgN2o
z+j{@jgQcw#XZF6a>zJ=sJ+t<y_=-IN=ldoZsr8>!zpOoRV^x~ZT#p6oW;MI7f5H9g
zuY>G|``;K&WgOq@&mjHfYW2M{g>U{GF0OD=pBT}=+O}ZNo~Bai|1(T}+*U67`LDd~
z_9w3SPk*Lz3mi&1ye`?QbE}qYzK{46^|Qa{6*bpy$(Y2uZzEGn=R=mYsY1PG@#Y6}
z{}wR{Yw9l9qEIs}^z^gOE*IavyOg%qD6CzuA}CUgukK^h?wgy+SlwQzDC7hja^Ye$
z>N-DtjnCnRiQ7wq|3`mRP_Jn--LH{!()sWm6*C5JtEL0zucUlTK6$A6#+EEgw+}3B
z297hfU0=FEHO1}4q`6Z~JQE$mH`UIoaGP{#%lqkSEq<HxemdKjm2a4RL`}4K{_F#H
z54``<cf7tp|MmR%wuMY#TCbIL93~nr{_<+(WRr_04%$9?-85y{r-saG$0z}-v%j7e
zNB%jWVBUH5z>f3I3-~wO;H{g>9Cst?*hZCQzD|s<9-ddwHl8T&CRXOJlNB^^+No^6
z`p24PYbqwV7XRAqc_yslmg|Gp2l(f9dp>TzF)iOB&t9gnkzrwUkf+Bif$RnGj&U`c
z7BUwLAH3}}`A}1Ws`T{p4`(0#V>K;)S6tt%`K{O1>9sxRY&klGoo9+n3)8wi3d)Rb
zJo+9f3-(#+9a!cT^Ve;zwDym8EjCsrz3=XAjLf{ZrL>1Ps;fmtNKCBbn08I}p9w#H
z)cu?*JZ+j-&`EbL(=ZO6hZO+=JV*0p98f=y_&h24q@&mOx=AYvTb5?t+BT;#^|aS4
z0ZxP8^B6y#tSUXb>0n~Namu0QZ7RA;e!buONvdp5sq67gd$)$)pXSx+rog|0e}Um0
zpPTIIGfnCg_Ex898*DqeB;=!lZb$VIrTgLwKm9RHGVGqOv&UBRM5;}N>l}egi{3n5
zZL|5OOuC-=PR>6&RfXK7<Hh<I_Ri_s7yo(l;tILR$G>j(Zm;0lx-`+^<(1i;7ftz%
zHgkl=F4!#T!FS{JHRkTa>aQxQE=!*3V=d*`s<rS+My=7^q;-Nf7ROyFW^7uhk-sng
z<cf!TC1M_24_Yz#@l>Bpe`C6SMSeaM7pG&{=Wk}XroN2HrgO@x2K{@L6U+J7zdUDe
zj69GzePQpnnlQr#rw0NT4!?Z!>iv;x@#mAiJ#iAfv+e8S?B?UnCj$@uk>AVGU~k?0
zYX5nq!`h*5W)w=+MnoQ8Hc4yS)VgK%=F1Me4~{CG^^Wmom{`$?xy;8_<XbbaG@aFn
z`Ng(=y4?21juu4$VOwX-43bbaKdz_w%vV?8u=ZoI@&odgrM<E5uk1KD`_<gX6IM;z
z%eDM^>*)+%r?%HJOkNF{4*3l;G;e(VC&~8pY~qy*c^?;)sXYCBY=+%F@$!2YdyhZo
zTjH%g>Cu8!W@oO|hiuIHo*MJ3PVC3*=+}CukAGb1d?4{Y&mYzq93l)6PMgx-TYlP=
z7I<N^@V}gXuB_XKYCjuE+Nw;~i&R;AD0Hh}T<z*v@q3Fd{=H**;I&kQGqX<c1h1Ej
zvU?W3`^Xe|YHxMJ#sdx;R(IA<i%q)G5cBIv>7n~Kh0p&~xoT6kApCk;<zstOo6o<C
zPo!8_hn^~_uM^aJtuFX+Sz>MfvZFp<<266<D#Y3C+xcFI)wY)B#oNR0jVE!N`kMX!
zw_=`p`21s=Ce4fF+B1czyI`Wg%Ow}5**p+98Spn>o5^`@W4`<vwf)s%t$S;qlzdy!
zlN`N&m6^}alWcOam0iy=gxdbTn(Mrxa&As?=2^}SuRWGHA9(z!rLNAO^(#mEhu!U2
zZ_GD1&V4&$g4)%sf_||)!CM}&JXBj~|9ZtYxi<~pGct{rrL3OpsdO<)Kzd#2p~+1X
z+@HRRQPpJNlUc2PC&jR;z${(gJgCy}$f8HVSJ-|3N~Sklb#P%`5^cTAPV9Kd<-Llx
zqdI%dI3(AVaeR2Ka?0QA!#noUE38Q(`^!4DOFc!?L^lL2O<&m9voc3K@Ohf6(kh#U
z$DL+tZ{)kS`rJ$}yO~<rmS>mWQhwF#l>Ir5wM(>9jkm-@`Qj1>_mJXu7gJdj_GV5I
zx~_X)_s_IdKe8Frwm2v)I1nGu;JoS?=c-$$6(2S9X9Wpq24zJ>`|K*QnWb(sOMOo1
zp^q0dzJA@g|Jh#u#`=|9n<Y82gEB8INl~3v;-fpEHJg9Y-RhL8FryerO=snYG2$9d
zaiz7P+E<ch?JI3qroF&7{6XAysqN*H*DrNFw>Z+u`E%dD{a1{7E*#jo_O)HK-pqR+
z^is7vCD+}L6W3hNJ!NK6;i9RN97~><Wm{=p+qlErHSyV$Ge)ip)3!|1vC5f$!(%hg
s^1ThW3jN!2O3IJ8?c6i*;D6?f+8vuO2ij*bFfcH9y85}Sb4q9e002j7<^TWy
literal 0
HcmV?d00001
--
GitLab