From d18315aa39ed94fde346283778ad6e7be47af887 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sat, 11 Nov 2017 22:08:24 +0100
Subject: [PATCH] Fix https on simplesaml and remove /login

---
 dist/dataporten_config.php |  3 ++-
 dist/saml20-idp-remote.php |  4 ++--
 www/login/index.php        | 14 --------------
 3 files changed, 4 insertions(+), 17 deletions(-)
 delete mode 100644 www/login/index.php

diff --git a/dist/dataporten_config.php b/dist/dataporten_config.php
index 1a280eb..dba9860 100644
--- a/dist/dataporten_config.php
+++ b/dist/dataporten_config.php
@@ -5,7 +5,8 @@
 $dataportenConfig = [
 	'client_id' => "",
 	'client_secret' => "",
-	'redirect_uri' => "",
+	//'redirect_uri' => "https://pvv.ntnu.no/paamelding/",
+	'redirect_uri' => "http://localhost:1080/paamelding/",
 	'auth' => "https://auth.dataporten.no/oauth/authorization",#Authorization endpoint
 	'token' => "https://auth.dataporten.no/oauth/token",#Token endpoint
 	
diff --git a/dist/saml20-idp-remote.php b/dist/saml20-idp-remote.php
index 3d5a77d..ba19a96 100644
--- a/dist/saml20-idp-remote.php
+++ b/dist/saml20-idp-remote.php
@@ -7,7 +7,7 @@ $metadata['https://www.pvv.ntnu.no/idp'] = array (
     0 => 
     array (
       'Binding' => 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect',
-      'Location' => 'http://www.pvv.ntnu.no/idp/saml2/idp/SSOService.php',
+      'Location' => 'https://www.pvv.ntnu.no/idp/saml2/idp/SSOService.php',
     ),
   ),
   'SingleLogoutService' => 
@@ -15,7 +15,7 @@ $metadata['https://www.pvv.ntnu.no/idp'] = array (
     0 => 
     array (
       'Binding' => 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect',
-      'Location' => 'http://www.pvv.ntnu.no/idp/saml2/idp/SingleLogoutService.php',
+      'Location' => 'https://www.pvv.ntnu.no/idp/saml2/idp/SingleLogoutService.php',
     ),
   ),
   'certData' => 'MIICgDCCAemgAwIBAgIJAP13Q5w2R3KgMA0GCSqGSIb3DQEBBQUAMDUxCzAJBgNVBAYTAk5PMRgwFgYDVQQIFA9Tw7hyLVRyw7huZGVsYWcxDDAKBgNVBAoTA1BWVjAeFw0xNDAzMTMxODIzNTVaFw0yNDAzMTIxODIzNTVaMDUxCzAJBgNVBAYTAk5PMRgwFgYDVQQIFA9Tw7hyLVRyw7huZGVsYWcxDDAKBgNVBAoTA1BWVjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAzckfyofefuJr/gDl0vj7gbIGiwXD825c3YidWK2Cg37ZmSycVk3mng4OqZkQbKY8wRaHg/fruqicDhodCPq9dF7/+QmYAG8PMKmpCIvnKaT7EjOGQtCnxv2+17CF0c7IuLjlwNZG8m0xDBZZp8ymj6QK+mJfVEahBPbkMaCBGIsCAwEAAaOBlzCBlDAdBgNVHQ4EFgQUNEuP7yZVDneEA4uTfJv/UFA9gjcwZQYDVR0jBF4wXIAUNEuP7yZVDneEA4uTfJv/UFA9gjehOaQ3MDUxCzAJBgNVBAYTAk5PMRgwFgYDVQQIFA9Tw7hyLVRyw7huZGVsYWcxDDAKBgNVBAoTA1BWVoIJAP13Q5w2R3KgMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAg8hx8aRy/Fz9PK9UckOQ92WSoRCyr/ldQSf0OTRTMyG+zsSrzVsDX3+BFWbMAFrEu7SZAakd9FQajTUw0d930iaDP+ptX1uIxb64OOY0glLOW3Ru/CL309JwUIkDADa8drpRK4IFDvzs5nVpaj75X1pp583e+psuNST8f+mLspw=',
diff --git a/www/login/index.php b/www/login/index.php
deleted file mode 100644
index 65358ba..0000000
--- a/www/login/index.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-require_once(__DIR__ . '/../../vendor/simplesamlphp/simplesamlphp/lib/_autoload.php');
-$as = new SimpleSAML_Auth_Simple('default-sp');
-$as->requireAuth();
-$attributes = $as->getAttributes();
-?>
-
-<p>
-	Username: <?= $attributes["uid"][0]?><br>
-	Full name: <?= $attributes["cn"][0]?><br>
-	Email: <?= $attributes["mail"][0]?><br>
-</p>
-
-<a href="<?= htmlspecialchars($as->getLogoutURL("http://localhost:1080/")) ?>">logout</a>