From 4c1536136f10ca2487b491a57691f2aa79ddd305 Mon Sep 17 00:00:00 2001
From: Paul Caskey <pcaskey@internet2.edu>
Date: Thu, 10 Jun 2021 14:32:49 -0500
Subject: [PATCH 01/27] Update custom-body.php
---
assets/dsroot/custom-body.php | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/assets/dsroot/custom-body.php b/assets/dsroot/custom-body.php
index 4ce0f8b..3103050 100644
--- a/assets/dsroot/custom-body.php
+++ b/assets/dsroot/custom-body.php
@@ -5,7 +5,9 @@
<br /><?php echo getLocalString('header'); ?> <br /><br />
<div style="text-align:left;font-size:14px">
-If you do not find your organization in this list, the other supported option is a Google account. You will find Google in the Identity Provider list. Please note that the old Internet2 SiteID is no longer available and those IDs no longer work.
+If you do not find your organization in this list, there are two options:<br />
+1. You can <a href='/Saml2/disco?entityID=https%3A%2F%2Fgoogle.cirrusidentity.com%2Fgateway'>login with your Google account</a>.<br />
+2. You can <a href='https://internet2.idp.cirrusidentity.com/'>create an account at the Internet2 Guest System</a> and then use that account to login. <br />
</div>
<br />
From 96906f879257e4a59c9e19d4b42350a159c9ac44 Mon Sep 17 00:00:00 2001
From: Paul Caskey <pcaskey@internet2.edu>
Date: Thu, 10 Jun 2021 14:34:43 -0500
Subject: [PATCH 02/27] Update custom-body.php
---
assets/dsroot/custom-body.php | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/assets/dsroot/custom-body.php b/assets/dsroot/custom-body.php
index 3103050..d4efbed 100644
--- a/assets/dsroot/custom-body.php
+++ b/assets/dsroot/custom-body.php
@@ -5,9 +5,11 @@
<br /><?php echo getLocalString('header'); ?> <br /><br />
<div style="text-align:left;font-size:14px">
-If you do not find your organization in this list, there are two options:<br />
-1. You can <a href='/Saml2/disco?entityID=https%3A%2F%2Fgoogle.cirrusidentity.com%2Fgateway'>login with your Google account</a>.<br />
-2. You can <a href='https://internet2.idp.cirrusidentity.com/'>create an account at the Internet2 Guest System</a> and then use that account to login. <br />
+ If you do not find your organization in this list, there are two options:<br />
+ <ol>
+ <li>You can <a href='/Saml2/disco?entityID=https%3A%2F%2Fgoogle.cirrusidentity.com%2Fgateway'>login with your Google account</a>.<br /></li>
+ <li>You can <a href='https://internet2.idp.cirrusidentity.com/'>create an account at the Internet2 Guest System</a> and then use that account to login. <br /></li>
+ </ol>
</div>
<br />
From 2ceb29406b11a9c21b8dcc14b1f0d56ddf44d3c2 Mon Sep 17 00:00:00 2001
From: Paul Caskey <pcaskey@internet2.edu>
Date: Thu, 10 Jun 2021 14:51:05 -0500
Subject: [PATCH 03/27] Update custom-body.php
---
assets/dsroot/custom-body.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/assets/dsroot/custom-body.php b/assets/dsroot/custom-body.php
index d4efbed..928697d 100644
--- a/assets/dsroot/custom-body.php
+++ b/assets/dsroot/custom-body.php
@@ -8,7 +8,7 @@
If you do not find your organization in this list, there are two options:<br />
<ol>
<li>You can <a href='/Saml2/disco?entityID=https%3A%2F%2Fgoogle.cirrusidentity.com%2Fgateway'>login with your Google account</a>.<br /></li>
- <li>You can <a href='https://internet2.idp.cirrusidentity.com/'>create an account at the Internet2 Guest System</a> and then use that account to login. <br /></li>
+ <li>You can <a href='https://internet2.idp.cirrusidentity.com/' target='_blank'>create an account at the Internet2 Guest System</a> and then use that account to login. <br /></li>
</ol>
</div>
<br />
From dbf986e3aa647077c7899abeb5b0525f734e0788 Mon Sep 17 00:00:00 2001
From: Paul Caskey <pcaskey@internet2.edu>
Date: Fri, 11 Jun 2021 09:35:53 -0500
Subject: [PATCH 04/27] Update custom-body.php
---
assets/dsroot/custom-body.php | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/assets/dsroot/custom-body.php b/assets/dsroot/custom-body.php
index 928697d..82bbcdf 100644
--- a/assets/dsroot/custom-body.php
+++ b/assets/dsroot/custom-body.php
@@ -8,7 +8,9 @@
If you do not find your organization in this list, there are two options:<br />
<ol>
<li>You can <a href='/Saml2/disco?entityID=https%3A%2F%2Fgoogle.cirrusidentity.com%2Fgateway'>login with your Google account</a>.<br /></li>
- <li>You can <a href='https://internet2.idp.cirrusidentity.com/' target='_blank'>create an account at the Internet2 Guest System</a> and then use that account to login. <br /></li>
+ <li>You can
+ <a href='https://apps.cirrusidentity.com/cirrusid/internet2.edu/register/index?returnUrl=https%3A%2F%2Finternet2.idp.cirrusidentity.com%2Fmodule.php%2Fcore%2Floginuserpass.php%3FAuthState%3D_46ab972c3df07891f4aa1f25eee39b7ecf74532c9a%253Ahttps%253A%252F%252Finternet2.idp.cirrusidentity.com%252Fsaml2%252Fidp%252FSSOService.php%253Fspentityid%253Dhttps%25253A%25252F%25252Flogin.dev.at.internet2.edu%25252FSaml2%25252Fproxy_saml2_backend.xml%2526RelayState%253DG30994nd8A6GcWKL%2526ConsumerURL%253Dhttps%25253A%25252F%25252Flogin.dev.at.internet2.edu%25252FSaml2%25252Facs%25252Fpost%2526cookieTime%253D1623421416' target='_blank'>
+ register for an Internet2 Guest Login</a> and then <a href='/Saml2/disco?entityID=https%3A%2F%2Finternet2.idp.cirrusidentity.com%2Fidp'>choose the 'Internet2 Guest Login'</a> on future visits to this service. <br /></li>
</ol>
</div>
<br />
From ce53bb87695c3b54cefbc0a3e342d21bc25b7418 Mon Sep 17 00:00:00 2001
From: Paul Caskey <pcaskey@internet2.edu>
Date: Fri, 11 Jun 2021 10:35:27 -0500
Subject: [PATCH 05/27] Update custom-body.php
---
assets/dsroot/custom-body.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/assets/dsroot/custom-body.php b/assets/dsroot/custom-body.php
index 82bbcdf..e8d2e79 100644
--- a/assets/dsroot/custom-body.php
+++ b/assets/dsroot/custom-body.php
@@ -9,8 +9,8 @@
<ol>
<li>You can <a href='/Saml2/disco?entityID=https%3A%2F%2Fgoogle.cirrusidentity.com%2Fgateway'>login with your Google account</a>.<br /></li>
<li>You can
- <a href='https://apps.cirrusidentity.com/cirrusid/internet2.edu/register/index?returnUrl=https%3A%2F%2Finternet2.idp.cirrusidentity.com%2Fmodule.php%2Fcore%2Floginuserpass.php%3FAuthState%3D_46ab972c3df07891f4aa1f25eee39b7ecf74532c9a%253Ahttps%253A%252F%252Finternet2.idp.cirrusidentity.com%252Fsaml2%252Fidp%252FSSOService.php%253Fspentityid%253Dhttps%25253A%25252F%25252Flogin.dev.at.internet2.edu%25252FSaml2%25252Fproxy_saml2_backend.xml%2526RelayState%253DG30994nd8A6GcWKL%2526ConsumerURL%253Dhttps%25253A%25252F%25252Flogin.dev.at.internet2.edu%25252FSaml2%25252Facs%25252Fpost%2526cookieTime%253D1623421416' target='_blank'>
- register for an Internet2 Guest Login</a> and then <a href='/Saml2/disco?entityID=https%3A%2F%2Finternet2.idp.cirrusidentity.com%2Fidp'>choose the 'Internet2 Guest Login'</a> on future visits to this service. <br /></li>
+ <a href='https://apps.cirrusidentity.com/cirrusid/internet2.edu/register/index' target='_blank'> register for an Internet2 Guest Login</a>
+ and then <a href='/Saml2/disco?entityID=https%3A%2F%2Finternet2.idp.cirrusidentity.com%2Fidp'>choose the 'Internet2 Guest Login'</a> on future visits to this service. <br /></li>
</ol>
</div>
<br />
From 40feb204ed0002b7e0a99b103b16d376f811910c Mon Sep 17 00:00:00 2001
From: Paul Caskey <pcaskey@internet2.edu>
Date: Tue, 31 Aug 2021 15:15:02 -0500
Subject: [PATCH 06/27] add return URL for IdPoLR
---
assets/dsroot/custom-body.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/assets/dsroot/custom-body.php b/assets/dsroot/custom-body.php
index e8d2e79..1f1f2b1 100644
--- a/assets/dsroot/custom-body.php
+++ b/assets/dsroot/custom-body.php
@@ -9,7 +9,7 @@
<ol>
<li>You can <a href='/Saml2/disco?entityID=https%3A%2F%2Fgoogle.cirrusidentity.com%2Fgateway'>login with your Google account</a>.<br /></li>
<li>You can
- <a href='https://apps.cirrusidentity.com/cirrusid/internet2.edu/register/index' target='_blank'> register for an Internet2 Guest Login</a>
+ <a href='https://apps.cirrusidentity.com/cirrusid/internet2.edu/register/index?returnURL=javascript%3Awindow.close%28%29' target='_blank'> register for an Internet2 Guest Login</a>
and then <a href='/Saml2/disco?entityID=https%3A%2F%2Finternet2.idp.cirrusidentity.com%2Fidp'>choose the 'Internet2 Guest Login'</a> on future visits to this service. <br /></li>
</ol>
</div>
From 3a0449af60e470fb4ec47d79914f4a2363d25551 Mon Sep 17 00:00:00 2001
From: Paul Caskey <pcaskey@internet2.edu>
Date: Fri, 3 Sep 2021 13:35:43 -0500
Subject: [PATCH 07/27] Update custom-body.php
---
assets/dsroot/custom-body.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/assets/dsroot/custom-body.php b/assets/dsroot/custom-body.php
index 1f1f2b1..319e07e 100644
--- a/assets/dsroot/custom-body.php
+++ b/assets/dsroot/custom-body.php
@@ -9,7 +9,7 @@
<ol>
<li>You can <a href='/Saml2/disco?entityID=https%3A%2F%2Fgoogle.cirrusidentity.com%2Fgateway'>login with your Google account</a>.<br /></li>
<li>You can
- <a href='https://apps.cirrusidentity.com/cirrusid/internet2.edu/register/index?returnURL=javascript%3Awindow.close%28%29' target='_blank'> register for an Internet2 Guest Login</a>
+ <a href='https://apps.cirrusidentity.com/cirrusid/internet2.edu/register/index?returnUrl=https%3A%2F%2Fcomanage.at.internet2.edu%2Fregistry%2Fpages%2Fpublic%2Fclosetab' target='_blank'> register for an Internet2 Guest Login</a>
and then <a href='/Saml2/disco?entityID=https%3A%2F%2Finternet2.idp.cirrusidentity.com%2Fidp'>choose the 'Internet2 Guest Login'</a> on future visits to this service. <br /></li>
</ol>
</div>
From 6cc2841cf5d67c93ce6016ed7e1710c786c89013 Mon Sep 17 00:00:00 2001
From: Paul Caskey <pcaskey@internet2.edu>
Date: Tue, 2 Nov 2021 14:03:28 -0500
Subject: [PATCH 08/27] check remember-for-session
---
assets/dsroot/custom-body.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/assets/dsroot/custom-body.php b/assets/dsroot/custom-body.php
index 319e07e..b53e367 100644
--- a/assets/dsroot/custom-body.php
+++ b/assets/dsroot/custom-body.php
@@ -27,7 +27,7 @@
</div>
<div style="text-align: left">
<p class="selectOptions">
- <input type="checkbox" <?php echo $rememberSelectionChecked ?> name="session" id="rememberForSession" value="true">
+ <input type="checkbox" checked name="session" id="rememberForSession" value="true">
<label for="rememberForSession"><?php echo getLocalString('remember_selection') ?></label><br>
<?php if ($showPermanentSetting) : ?>
<!-- Value permanent must be a number which is equivalent to the days the cookie should be valid -->
From 6ad4867d421ae22b80bd64b8d5290484dcb54a63 Mon Sep 17 00:00:00 2001
From: aaschenbrener <aaschenbrener@internet2.edu>
Date: Fri, 4 Mar 2022 09:49:43 -0500
Subject: [PATCH 09/27] Updated Internet2 Guest Language
---
assets/dsroot/custom-body.php | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/assets/dsroot/custom-body.php b/assets/dsroot/custom-body.php
index b53e367..a1cfd36 100644
--- a/assets/dsroot/custom-body.php
+++ b/assets/dsroot/custom-body.php
@@ -8,9 +8,9 @@
If you do not find your organization in this list, there are two options:<br />
<ol>
<li>You can <a href='/Saml2/disco?entityID=https%3A%2F%2Fgoogle.cirrusidentity.com%2Fgateway'>login with your Google account</a>.<br /></li>
- <li>You can
- <a href='https://apps.cirrusidentity.com/cirrusid/internet2.edu/register/index?returnUrl=https%3A%2F%2Fcomanage.at.internet2.edu%2Fregistry%2Fpages%2Fpublic%2Fclosetab' target='_blank'> register for an Internet2 Guest Login</a>
- and then <a href='/Saml2/disco?entityID=https%3A%2F%2Finternet2.idp.cirrusidentity.com%2Fidp'>choose the 'Internet2 Guest Login'</a> on future visits to this service. <br /></li>
+ <li>You can <a href='/Saml2/disco?entityID=https%3A%2F%2Finternet2.idp.cirrusidentity.com%2Fidp'>login with your Internet2 Guest account</a>.
+ If you are new, you may <a href='https://apps.cirrusidentity.com/cirrusid/internet2.edu/register/index?returnUrl=https%3A%2F%2Fcomanage.at.internet2.edu%2Fregistry%2Fpages%2Fpublic%2Fclosetab' target='_blank'>create an Internet2 Guest account</a>
+ (see <a href='https://spaces.at.internet2.edu/x/HpcbDQ'>Guest Account Guide</a>).<br /></li>
</ol>
</div>
<br />
From 7f9b7163c8be843b14200b10123b972bcc3dad08 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Tue, 12 Apr 2022 14:02:31 -0400
Subject: [PATCH 10/27] testing javascript cookie set for eduroam
---
assets/dsroot/custom-body.php | 37 ++++++++++++++++++++++++++++++++++-
1 file changed, 36 insertions(+), 1 deletion(-)
diff --git a/assets/dsroot/custom-body.php b/assets/dsroot/custom-body.php
index a1cfd36..2e8ef97 100644
--- a/assets/dsroot/custom-body.php
+++ b/assets/dsroot/custom-body.php
@@ -1,9 +1,30 @@
<?php // Copyright (c) 2016, SWITCH
// CAF 2016 ?>
+<script>
+function setCirrusIDP() {
+ document.cookie = "_icmpwayf_saml_idp=aHR0cHM6Ly9pbnRlcm5ldDIuaWRwLmNpcnJ1c2lkZW50aXR5LmNvbS9pZHA";
+ document.cookie = "_icmpwayf_redirection_state=checked";
+ window.location.assign("https://login.at.internet2.edu/Saml2/disco?entityID=https%3A%2F%2Finternet2.idp.cirrusidentity.com%2Fidp");
+}
+
+function setGoogleIDP() {
+ document.cookie = "_icmpwayf_saml_idp=aHR0cHM6Ly9pbnRlcm5ldDIuaWRwLmNpcnJ1c2lkZW50aXR5LmNvbS9pZHA";
+ document.cookie = "_icmpwayf_redirection_state=checked";
+ window.location.assign("https://login.at.internet2.edu/Saml2/disco?entityID=https%3A%2F%2Finternet2.idp.cirrusidentity.com%2Fidp");
+}
+
+
+</script>
+
+
+
+</script>
+
+
<!-- Identity Provider Selection: Start -->
<br /><?php echo getLocalString('header'); ?> <br /><br />
-
+<strong> Working Links </strong>
<div style="text-align:left;font-size:14px">
If you do not find your organization in this list, there are two options:<br />
<ol>
@@ -13,6 +34,20 @@
(see <a href='https://spaces.at.internet2.edu/x/HpcbDQ'>Guest Account Guide</a>).<br /></li>
</ol>
</div>
+<hr/>
+<strong>Testing Links</strong>
+<div style="text-align:left;font-size:14px">
+ If you do not find your organization in this list, there are two options:<br />
+ <ol>
+ <li>You can <a href="#" onclick="setGoogleIDP();return false;">login with your Google account</a>.<br /></li>
+ <li>You can <a href="#" onclick="setCirrusIDP();return false;">login with your Internet2 Guest account</a>.
+ If you are new, you may <a href='https://apps.cirrusidentity.com/cirrusid/internet2.edu/register/index?returnUrl=https%3A%2F%2Fcomanage.at.internet2.edu%2Fregistry%2Fpages%2Fpublic%2Fclosetab' target='_blank'>create an Internet2 Guest account</a>
+ (see <a href='https://spaces.at.internet2.edu/x/HpcbDQ'>Guest Account Guide</a>).<br /></li>
+ </ol>
+</div>
+
+
+
<br />
<form id="IdPList" name="IdPList" method="post" onSubmit="return checkForm()" action="<?php echo $actionURL ?>">
From 5fe9031dfb1f93e4d0bf62da6247bab8000246cf Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Tue, 12 Apr 2022 14:17:15 -0400
Subject: [PATCH 11/27] Update custom-body.php
---
assets/dsroot/custom-body.php | 1 +
1 file changed, 1 insertion(+)
diff --git a/assets/dsroot/custom-body.php b/assets/dsroot/custom-body.php
index 2e8ef97..fd90928 100644
--- a/assets/dsroot/custom-body.php
+++ b/assets/dsroot/custom-body.php
@@ -5,6 +5,7 @@
function setCirrusIDP() {
document.cookie = "_icmpwayf_saml_idp=aHR0cHM6Ly9pbnRlcm5ldDIuaWRwLmNpcnJ1c2lkZW50aXR5LmNvbS9pZHA";
document.cookie = "_icmpwayf_redirection_state=checked";
+ document.cookie = "_icmpwayf_redirect_user_idp=https%3A%2F%2Finternet2.idp.cirrusidentity.com%2Fidp";
window.location.assign("https://login.at.internet2.edu/Saml2/disco?entityID=https%3A%2F%2Finternet2.idp.cirrusidentity.com%2Fidp");
}
From 78e1eaffcb0dd265ca184332fb38cd0692cf07d8 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Tue, 12 Apr 2022 14:24:12 -0400
Subject: [PATCH 12/27] Update custom-body.php
---
assets/dsroot/custom-body.php | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/assets/dsroot/custom-body.php b/assets/dsroot/custom-body.php
index fd90928..27eb596 100644
--- a/assets/dsroot/custom-body.php
+++ b/assets/dsroot/custom-body.php
@@ -12,17 +12,11 @@ function setCirrusIDP() {
function setGoogleIDP() {
document.cookie = "_icmpwayf_saml_idp=aHR0cHM6Ly9pbnRlcm5ldDIuaWRwLmNpcnJ1c2lkZW50aXR5LmNvbS9pZHA";
document.cookie = "_icmpwayf_redirection_state=checked";
+ document.cookie = "_icmpwayf_redirect_user_idp=https%3A%2F%2Fgoogle.cirrusidentity.com%2Fgateway";
window.location.assign("https://login.at.internet2.edu/Saml2/disco?entityID=https%3A%2F%2Finternet2.idp.cirrusidentity.com%2Fidp");
}
-
-
</script>
-
-
-</script>
-
-
<!-- Identity Provider Selection: Start -->
<br /><?php echo getLocalString('header'); ?> <br /><br />
<strong> Working Links </strong>
From dba8206272c95bbc3e6d8d0f446c7616462e8462 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Tue, 12 Apr 2022 14:29:16 -0400
Subject: [PATCH 13/27] Update custom-body.php
---
assets/dsroot/custom-body.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/assets/dsroot/custom-body.php b/assets/dsroot/custom-body.php
index 27eb596..2386823 100644
--- a/assets/dsroot/custom-body.php
+++ b/assets/dsroot/custom-body.php
@@ -10,10 +10,10 @@ function setCirrusIDP() {
}
function setGoogleIDP() {
- document.cookie = "_icmpwayf_saml_idp=aHR0cHM6Ly9pbnRlcm5ldDIuaWRwLmNpcnJ1c2lkZW50aXR5LmNvbS9pZHA";
+ document.cookie = "_icmpwayf_saml_idp=aHR0cHM6Ly9nb29nbGUuY2lycnVzaWRlbnRpdHkuY29tL2dhdGV3YXk";
document.cookie = "_icmpwayf_redirection_state=checked";
document.cookie = "_icmpwayf_redirect_user_idp=https%3A%2F%2Fgoogle.cirrusidentity.com%2Fgateway";
- window.location.assign("https://login.at.internet2.edu/Saml2/disco?entityID=https%3A%2F%2Finternet2.idp.cirrusidentity.com%2Fidp");
+ window.location.assign("https://login.at.internet2.edu/Saml2/disco?entityID=https%3A%2F%2Fgoogle.cirrusidentity.com%2Fgateway");
}
</script>
From 2368214531da1d66837d10fc7052390619e4ce54 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Tue, 12 Apr 2022 14:42:30 -0400
Subject: [PATCH 14/27] Update custom-body.php
---
assets/dsroot/custom-body.php | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/assets/dsroot/custom-body.php b/assets/dsroot/custom-body.php
index 2386823..c3f543f 100644
--- a/assets/dsroot/custom-body.php
+++ b/assets/dsroot/custom-body.php
@@ -3,16 +3,16 @@
<script>
function setCirrusIDP() {
- document.cookie = "_icmpwayf_saml_idp=aHR0cHM6Ly9pbnRlcm5ldDIuaWRwLmNpcnJ1c2lkZW50aXR5LmNvbS9pZHA";
- document.cookie = "_icmpwayf_redirection_state=checked";
- document.cookie = "_icmpwayf_redirect_user_idp=https%3A%2F%2Finternet2.idp.cirrusidentity.com%2Fidp";
+ document.cookie = "_icmpwayf_saml_idp=aHR0cHM6Ly9pbnRlcm5ldDIuaWRwLmNpcnJ1c2lkZW50aXR5LmNvbS9pZHA; path=/";
+ document.cookie = "_icmpwayf_redirection_state=checked; path=/";
+ document.cookie = "_icmpwayf_redirect_user_idp=https%3A%2F%2Finternet2.idp.cirrusidentity.com%2Fidp; path=/";
window.location.assign("https://login.at.internet2.edu/Saml2/disco?entityID=https%3A%2F%2Finternet2.idp.cirrusidentity.com%2Fidp");
}
function setGoogleIDP() {
- document.cookie = "_icmpwayf_saml_idp=aHR0cHM6Ly9nb29nbGUuY2lycnVzaWRlbnRpdHkuY29tL2dhdGV3YXk";
- document.cookie = "_icmpwayf_redirection_state=checked";
- document.cookie = "_icmpwayf_redirect_user_idp=https%3A%2F%2Fgoogle.cirrusidentity.com%2Fgateway";
+ document.cookie = "_icmpwayf_saml_idp=aHR0cHM6Ly9nb29nbGUuY2lycnVzaWRlbnRpdHkuY29tL2dhdGV3YXk; path=/";
+ document.cookie = "_icmpwayf_redirection_state=checked"; path=/;
+ document.cookie = "_icmpwayf_redirect_user_idp=https%3A%2F%2Fgoogle.cirrusidentity.com%2Fgateway"; path=/;
window.location.assign("https://login.at.internet2.edu/Saml2/disco?entityID=https%3A%2F%2Fgoogle.cirrusidentity.com%2Fgateway");
}
</script>
From 9e288fe9d1f7719ab9e4af7327c03c94a694ff99 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Tue, 12 Apr 2022 14:47:59 -0400
Subject: [PATCH 15/27] Update custom-body.php
---
assets/dsroot/custom-body.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/assets/dsroot/custom-body.php b/assets/dsroot/custom-body.php
index c3f543f..2cfc8ae 100644
--- a/assets/dsroot/custom-body.php
+++ b/assets/dsroot/custom-body.php
@@ -11,8 +11,8 @@ function setCirrusIDP() {
function setGoogleIDP() {
document.cookie = "_icmpwayf_saml_idp=aHR0cHM6Ly9nb29nbGUuY2lycnVzaWRlbnRpdHkuY29tL2dhdGV3YXk; path=/";
- document.cookie = "_icmpwayf_redirection_state=checked"; path=/;
- document.cookie = "_icmpwayf_redirect_user_idp=https%3A%2F%2Fgoogle.cirrusidentity.com%2Fgateway"; path=/;
+ document.cookie = "_icmpwayf_redirection_state=checked; path=/";
+ document.cookie = "_icmpwayf_redirect_user_idp=https%3A%2F%2Fgoogle.cirrusidentity.com%2Fgateway; path=/";
window.location.assign("https://login.at.internet2.edu/Saml2/disco?entityID=https%3A%2F%2Fgoogle.cirrusidentity.com%2Fgateway");
}
</script>
From 7ba51117ee52b445870403043ad15fc724f6b281 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Tue, 12 Apr 2022 15:08:09 -0400
Subject: [PATCH 16/27] Update custom-body.php
---
assets/dsroot/custom-body.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/assets/dsroot/custom-body.php b/assets/dsroot/custom-body.php
index 2cfc8ae..53f876c 100644
--- a/assets/dsroot/custom-body.php
+++ b/assets/dsroot/custom-body.php
@@ -6,14 +6,14 @@ function setCirrusIDP() {
document.cookie = "_icmpwayf_saml_idp=aHR0cHM6Ly9pbnRlcm5ldDIuaWRwLmNpcnJ1c2lkZW50aXR5LmNvbS9pZHA; path=/";
document.cookie = "_icmpwayf_redirection_state=checked; path=/";
document.cookie = "_icmpwayf_redirect_user_idp=https%3A%2F%2Finternet2.idp.cirrusidentity.com%2Fidp; path=/";
- window.location.assign("https://login.at.internet2.edu/Saml2/disco?entityID=https%3A%2F%2Finternet2.idp.cirrusidentity.com%2Fidp");
+ window.location.assign("https://login.dev.at.internet2.edu/Saml2/disco?entityID=https%3A%2F%2Finternet2.idp.cirrusidentity.com%2Fidp");
}
function setGoogleIDP() {
document.cookie = "_icmpwayf_saml_idp=aHR0cHM6Ly9nb29nbGUuY2lycnVzaWRlbnRpdHkuY29tL2dhdGV3YXk; path=/";
document.cookie = "_icmpwayf_redirection_state=checked; path=/";
document.cookie = "_icmpwayf_redirect_user_idp=https%3A%2F%2Fgoogle.cirrusidentity.com%2Fgateway; path=/";
- window.location.assign("https://login.at.internet2.edu/Saml2/disco?entityID=https%3A%2F%2Fgoogle.cirrusidentity.com%2Fgateway");
+ window.location.assign("https://login.dev.at.internet2.edu/Saml2/disco?entityID=https%3A%2F%2Fgoogle.cirrusidentity.com%2Fgateway");
}
</script>
From db43cd6c37506058c503e5f667b0731129702002 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Mon, 18 Apr 2022 14:45:58 -0400
Subject: [PATCH 17/27] promote testing section to main section
---
assets/dsroot/custom-body.php | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/assets/dsroot/custom-body.php b/assets/dsroot/custom-body.php
index 53f876c..3f38e81 100644
--- a/assets/dsroot/custom-body.php
+++ b/assets/dsroot/custom-body.php
@@ -19,18 +19,6 @@ function setGoogleIDP() {
<!-- Identity Provider Selection: Start -->
<br /><?php echo getLocalString('header'); ?> <br /><br />
-<strong> Working Links </strong>
-<div style="text-align:left;font-size:14px">
- If you do not find your organization in this list, there are two options:<br />
- <ol>
- <li>You can <a href='/Saml2/disco?entityID=https%3A%2F%2Fgoogle.cirrusidentity.com%2Fgateway'>login with your Google account</a>.<br /></li>
- <li>You can <a href='/Saml2/disco?entityID=https%3A%2F%2Finternet2.idp.cirrusidentity.com%2Fidp'>login with your Internet2 Guest account</a>.
- If you are new, you may <a href='https://apps.cirrusidentity.com/cirrusid/internet2.edu/register/index?returnUrl=https%3A%2F%2Fcomanage.at.internet2.edu%2Fregistry%2Fpages%2Fpublic%2Fclosetab' target='_blank'>create an Internet2 Guest account</a>
- (see <a href='https://spaces.at.internet2.edu/x/HpcbDQ'>Guest Account Guide</a>).<br /></li>
- </ol>
-</div>
-<hr/>
-<strong>Testing Links</strong>
<div style="text-align:left;font-size:14px">
If you do not find your organization in this list, there are two options:<br />
<ol>
From 4fd9a89e8b6763946ff29df61b71c8cb3a1280bb Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Mon, 18 Apr 2022 15:38:04 -0400
Subject: [PATCH 18/27] update URLs for staging
this needs to be re-factored to following our env dev/staging/prod naming conventions
---
assets/dsroot/custom-body.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/assets/dsroot/custom-body.php b/assets/dsroot/custom-body.php
index 3f38e81..0c1a570 100644
--- a/assets/dsroot/custom-body.php
+++ b/assets/dsroot/custom-body.php
@@ -6,14 +6,14 @@ function setCirrusIDP() {
document.cookie = "_icmpwayf_saml_idp=aHR0cHM6Ly9pbnRlcm5ldDIuaWRwLmNpcnJ1c2lkZW50aXR5LmNvbS9pZHA; path=/";
document.cookie = "_icmpwayf_redirection_state=checked; path=/";
document.cookie = "_icmpwayf_redirect_user_idp=https%3A%2F%2Finternet2.idp.cirrusidentity.com%2Fidp; path=/";
- window.location.assign("https://login.dev.at.internet2.edu/Saml2/disco?entityID=https%3A%2F%2Finternet2.idp.cirrusidentity.com%2Fidp");
+ window.location.assign("https://login.staging.at.internet2.edu/Saml2/disco?entityID=https%3A%2F%2Finternet2.idp.cirrusidentity.com%2Fidp");
}
function setGoogleIDP() {
document.cookie = "_icmpwayf_saml_idp=aHR0cHM6Ly9nb29nbGUuY2lycnVzaWRlbnRpdHkuY29tL2dhdGV3YXk; path=/";
document.cookie = "_icmpwayf_redirection_state=checked; path=/";
document.cookie = "_icmpwayf_redirect_user_idp=https%3A%2F%2Fgoogle.cirrusidentity.com%2Fgateway; path=/";
- window.location.assign("https://login.dev.at.internet2.edu/Saml2/disco?entityID=https%3A%2F%2Fgoogle.cirrusidentity.com%2Fgateway");
+ window.location.assign("https://login.staging.at.internet2.edu/Saml2/disco?entityID=https%3A%2F%2Fgoogle.cirrusidentity.com%2Fgateway");
}
</script>
From b3bd44ca89d2d7cf9d916d2e0572024707c9b8d8 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Mon, 18 Apr 2022 15:46:57 -0400
Subject: [PATCH 19/27] Update custom-body.php
---
assets/dsroot/custom-body.php | 1 +
1 file changed, 1 insertion(+)
diff --git a/assets/dsroot/custom-body.php b/assets/dsroot/custom-body.php
index 0c1a570..7d7fa58 100644
--- a/assets/dsroot/custom-body.php
+++ b/assets/dsroot/custom-body.php
@@ -60,6 +60,7 @@ function setGoogleIDP() {
</div>
</form>
+<input type="button" text="Help" href="#" onClick="script:window.location.assign('https://spaces.at.internet2.edu/x/EQO6Bw');return false;">
<!-- no message -->
<!-- Identity Provider Selection: End -->
From 3a416e85420f5b958f607a1b7753bb4d96c7a2aa Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Mon, 18 Apr 2022 15:47:17 -0400
Subject: [PATCH 20/27] Create custom-body.php
---
assets/dsroot/custom-body.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/assets/dsroot/custom-body.php b/assets/dsroot/custom-body.php
index 7d7fa58..d8fc36d 100644
--- a/assets/dsroot/custom-body.php
+++ b/assets/dsroot/custom-body.php
@@ -6,14 +6,14 @@ function setCirrusIDP() {
document.cookie = "_icmpwayf_saml_idp=aHR0cHM6Ly9pbnRlcm5ldDIuaWRwLmNpcnJ1c2lkZW50aXR5LmNvbS9pZHA; path=/";
document.cookie = "_icmpwayf_redirection_state=checked; path=/";
document.cookie = "_icmpwayf_redirect_user_idp=https%3A%2F%2Finternet2.idp.cirrusidentity.com%2Fidp; path=/";
- window.location.assign("https://login.staging.at.internet2.edu/Saml2/disco?entityID=https%3A%2F%2Finternet2.idp.cirrusidentity.com%2Fidp");
+ window.location.assign("https://login.dev.at.internet2.edu/Saml2/disco?entityID=https%3A%2F%2Finternet2.idp.cirrusidentity.com%2Fidp");
}
function setGoogleIDP() {
document.cookie = "_icmpwayf_saml_idp=aHR0cHM6Ly9nb29nbGUuY2lycnVzaWRlbnRpdHkuY29tL2dhdGV3YXk; path=/";
document.cookie = "_icmpwayf_redirection_state=checked; path=/";
document.cookie = "_icmpwayf_redirect_user_idp=https%3A%2F%2Fgoogle.cirrusidentity.com%2Fgateway; path=/";
- window.location.assign("https://login.staging.at.internet2.edu/Saml2/disco?entityID=https%3A%2F%2Fgoogle.cirrusidentity.com%2Fgateway");
+ window.location.assign("https://login.dev.at.internet2.edu/Saml2/disco?entityID=https%3A%2F%2Fgoogle.cirrusidentity.com%2Fgateway");
}
</script>
From 53edc5ad1f6a86e53d944ffc28e20713e0ae1899 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Mon, 18 Apr 2022 15:47:59 -0400
Subject: [PATCH 21/27] Update custom-body.php
---
assets/dsroot/custom-body.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/assets/dsroot/custom-body.php b/assets/dsroot/custom-body.php
index d8fc36d..1092161 100644
--- a/assets/dsroot/custom-body.php
+++ b/assets/dsroot/custom-body.php
@@ -60,7 +60,7 @@ function setGoogleIDP() {
</div>
</form>
-<input type="button" text="Help" href="#" onClick="script:window.location.assign('https://spaces.at.internet2.edu/x/EQO6Bw');return false;">
+<input type="button" text="Help" href="#" onClick="script:window.open('https://spaces.at.internet2.edu/x/EQO6Bw');return false;">
<!-- no message -->
<!-- Identity Provider Selection: End -->
From 912068535ea90ce89d9412a2127453e9935cb81c Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Mon, 18 Apr 2022 15:52:39 -0400
Subject: [PATCH 22/27] Update custom-body.php
---
assets/dsroot/custom-body.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/assets/dsroot/custom-body.php b/assets/dsroot/custom-body.php
index 1092161..c218140 100644
--- a/assets/dsroot/custom-body.php
+++ b/assets/dsroot/custom-body.php
@@ -60,7 +60,7 @@ function setGoogleIDP() {
</div>
</form>
-<input type="button" text="Help" href="#" onClick="script:window.open('https://spaces.at.internet2.edu/x/EQO6Bw');return false;">
+<input type="button" value="I'm having trouble logging in" href="#" onClick="script:window.open('https://spaces.at.internet2.edu/x/EQO6Bw');return false;">
<!-- no message -->
<!-- Identity Provider Selection: End -->
From 5c3931855f8ffd50c075a16cb4b47cb385034df6 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Mon, 18 Apr 2022 15:58:02 -0400
Subject: [PATCH 23/27] Update custom-body.php
---
assets/dsroot/custom-body.php | 1 +
1 file changed, 1 insertion(+)
diff --git a/assets/dsroot/custom-body.php b/assets/dsroot/custom-body.php
index c218140..d468215 100644
--- a/assets/dsroot/custom-body.php
+++ b/assets/dsroot/custom-body.php
@@ -60,6 +60,7 @@ function setGoogleIDP() {
</div>
</form>
+<br />
<input type="button" value="I'm having trouble logging in" href="#" onClick="script:window.open('https://spaces.at.internet2.edu/x/EQO6Bw');return false;">
<!-- no message -->
From 28b3ba1c76951154500a6a9367b5c88a35ba967f Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Mon, 18 Apr 2022 16:06:29 -0400
Subject: [PATCH 24/27] Update custom-body.php
---
assets/dsroot/custom-body.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/assets/dsroot/custom-body.php b/assets/dsroot/custom-body.php
index d468215..93e6d7d 100644
--- a/assets/dsroot/custom-body.php
+++ b/assets/dsroot/custom-body.php
@@ -6,14 +6,14 @@ function setCirrusIDP() {
document.cookie = "_icmpwayf_saml_idp=aHR0cHM6Ly9pbnRlcm5ldDIuaWRwLmNpcnJ1c2lkZW50aXR5LmNvbS9pZHA; path=/";
document.cookie = "_icmpwayf_redirection_state=checked; path=/";
document.cookie = "_icmpwayf_redirect_user_idp=https%3A%2F%2Finternet2.idp.cirrusidentity.com%2Fidp; path=/";
- window.location.assign("https://login.dev.at.internet2.edu/Saml2/disco?entityID=https%3A%2F%2Finternet2.idp.cirrusidentity.com%2Fidp");
+ window.location.assign("https://login.staging.at.internet2.edu/Saml2/disco?entityID=https%3A%2F%2Finternet2.idp.cirrusidentity.com%2Fidp");
}
function setGoogleIDP() {
document.cookie = "_icmpwayf_saml_idp=aHR0cHM6Ly9nb29nbGUuY2lycnVzaWRlbnRpdHkuY29tL2dhdGV3YXk; path=/";
document.cookie = "_icmpwayf_redirection_state=checked; path=/";
document.cookie = "_icmpwayf_redirect_user_idp=https%3A%2F%2Fgoogle.cirrusidentity.com%2Fgateway; path=/";
- window.location.assign("https://login.dev.at.internet2.edu/Saml2/disco?entityID=https%3A%2F%2Fgoogle.cirrusidentity.com%2Fgateway");
+ window.location.assign("https://login.staging.at.internet2.edu/Saml2/disco?entityID=https%3A%2F%2Fgoogle.cirrusidentity.com%2Fgateway");
}
</script>
From 0c6fab5df57c7de2030bb3aa20481e5df2110c61 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Tue, 19 Apr 2022 11:11:32 -0400
Subject: [PATCH 25/27] DEV
---
assets/dsroot/custom-body.php | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/assets/dsroot/custom-body.php b/assets/dsroot/custom-body.php
index 93e6d7d..602e79f 100644
--- a/assets/dsroot/custom-body.php
+++ b/assets/dsroot/custom-body.php
@@ -1,19 +1,19 @@
<?php // Copyright (c) 2016, SWITCH
// CAF 2016 ?>
-
+<strong> DEV </strong>
<script>
function setCirrusIDP() {
document.cookie = "_icmpwayf_saml_idp=aHR0cHM6Ly9pbnRlcm5ldDIuaWRwLmNpcnJ1c2lkZW50aXR5LmNvbS9pZHA; path=/";
document.cookie = "_icmpwayf_redirection_state=checked; path=/";
document.cookie = "_icmpwayf_redirect_user_idp=https%3A%2F%2Finternet2.idp.cirrusidentity.com%2Fidp; path=/";
- window.location.assign("https://login.staging.at.internet2.edu/Saml2/disco?entityID=https%3A%2F%2Finternet2.idp.cirrusidentity.com%2Fidp");
+ window.location.assign("https://login.dev.at.internet2.edu/Saml2/disco?entityID=https%3A%2F%2Finternet2.idp.cirrusidentity.com%2Fidp");
}
function setGoogleIDP() {
document.cookie = "_icmpwayf_saml_idp=aHR0cHM6Ly9nb29nbGUuY2lycnVzaWRlbnRpdHkuY29tL2dhdGV3YXk; path=/";
document.cookie = "_icmpwayf_redirection_state=checked; path=/";
document.cookie = "_icmpwayf_redirect_user_idp=https%3A%2F%2Fgoogle.cirrusidentity.com%2Fgateway; path=/";
- window.location.assign("https://login.staging.at.internet2.edu/Saml2/disco?entityID=https%3A%2F%2Fgoogle.cirrusidentity.com%2Fgateway");
+ window.location.assign("https://login.dev.at.internet2.edu/Saml2/disco?entityID=https%3A%2F%2Fgoogle.cirrusidentity.com%2Fgateway");
}
</script>
From b87868bcc3fcb2238774636bef3a510e482b9c1a Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Tue, 19 Apr 2022 11:13:42 -0400
Subject: [PATCH 26/27] updating to match other branching strategies for IAM
---
README.md | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 2b413bc..14e3181 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,10 @@
# CDS_Overlay
-Contains UI/Overlay files for the SWITCHWAYF container
+Contains UI/Overlay files for the SWITCHWAYF container for https://github.internet2.edu/ICP-OPs/ds.at.internet2.edu
+
+# Branches
+Create branches that maps to its corresponding branch container at https://github.internet2.edu/ICP-OPs/ds.at.internet2.edu
+e.g.:
+ds-v0.3.5-dev
+ds-v0.3.5-staging
+ds-v0.3.5-prod
+
From 74f8a0ec47e55463c76bf5e24d37603fcce8bb32 Mon Sep 17 00:00:00 2001
From: Christopher Hubing <chubing@internet2.edu>
Date: Tue, 19 Apr 2022 11:13:54 -0400
Subject: [PATCH 27/27] Update README.md
---
README.md | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/README.md b/README.md
index 14e3181..fa6e804 100644
--- a/README.md
+++ b/README.md
@@ -3,8 +3,13 @@ Contains UI/Overlay files for the SWITCHWAYF container for https://github.intern
# Branches
Create branches that maps to its corresponding branch container at https://github.internet2.edu/ICP-OPs/ds.at.internet2.edu
+
e.g.:
+
+
ds-v0.3.5-dev
+
ds-v0.3.5-staging
+
ds-v0.3.5-prod