dotCMS · jdotcms · Jun 5, 2020 · Jun 18, 2020 · Jul 27, 2020 · Jul 27, 2020
diff --git a/.../dotserver/tomcat-8.5.32/webapps/ROOT/WEB-INF/velocity/templates/add-html-body-content.vm b/.../dotserver/tomcat-8.5.32/webapps/ROOT/WEB-INF/velocity/templates/add-html-body-content.vm
@@ -0,0 +1,2 @@
+## Stub file that one can replace with Velocity template (and thus HTML) content
+## to be placed into the BODY section of the response
diff --git a/.../dotserver/tomcat-8.5.32/webapps/ROOT/WEB-INF/velocity/templates/add-html-head-content.vm b/.../dotserver/tomcat-8.5.32/webapps/ROOT/WEB-INF/velocity/templates/add-html-head-content.vm
@@ -0,0 +1,2 @@
+## Stub file that one can replace with Velocity template (and thus HTML) content
+## to be placed into the HEAD section of the response
diff --git a/ROOT/dotserver/tomcat-8.5.32/webapps/ROOT/WEB-INF/velocity/templates/saml1-post-binding.vm b/ROOT/dotserver/tomcat-8.5.32/webapps/ROOT/WEB-INF/velocity/templates/saml1-post-binding.vm
@@ -0,0 +1,43 @@
+##
+## Velocity Template for SAML 1 HTTP-POST binding
+##
+## Velocity context may contain the following properties
+## action - String - the action URL for the form
+## binding - String - the SAML binding type in use
+## TARGET - String - the relay state for the message
+## SAMLResponse - String - the Base64 encoded SAML Response
+##
+<!DOCTYPE html>
+<html>
+
+    <head>
+        <meta charset="utf-8" />
+        #parse ( "/templates/add-html-head-content.vm" )
+    </head>
+
+    <body onload="document.forms[0].submit()">
+        <noscript>
+            <p>
+                <strong>Note:</strong> Since your browser does not support JavaScript,
+                you must press the Continue button once to proceed.
+            </p>
+        </noscript>
+
+        <form action="${action}" method="post">
+            <div>                
+                #if($SAMLResponse)<input type="hidden" name="SAMLResponse" value="${SAMLResponse}"/>#end
+
+                #if($TARGET)<input type="hidden" name="TARGET" value="${TARGET}"/>#end
+
+            </div>
+            <noscript>
+                <div>
+                    <input type="submit" value="Continue"/>
+                </div>
+            </noscript>
+        </form>
+
+        #parse ( "/templates/add-html-body-content.vm" )
+
+    </body>
+</html>
diff --git a/...rver/tomcat-8.5.32/webapps/ROOT/WEB-INF/velocity/templates/saml2-post-artifact-binding.vm b/...rver/tomcat-8.5.32/webapps/ROOT/WEB-INF/velocity/templates/saml2-post-artifact-binding.vm
@@ -0,0 +1,40 @@
+##
+## Velocity Template for SAML 2 HTTP-POST binding
+##
+## Velocity context may contain the following properties
+## action - String - the action URL for the form
+## binding - String - the SAML binding type in use
+## RelayState - String - the relay state for the message
+## SAMLArt - String - SAML 2 artifact
+##
+<!DOCTYPE html>
+<html>
+    <head>
+        <meta charset="utf-8" />
+        #parse ( "/templates/add-html-head-content.vm" )
+    </head>
+    <body onload="document.forms[0].submit()">
+        <noscript>
+            <p>
+                <strong>Note:</strong> Since your browser does not support JavaScript,
+                you must press the Continue button once to proceed.
+            </p>
+        </noscript>
+
+        <form action="${action}" method="post">
+            <div>
+                #if($RelayState)
+                <input type="hidden" name="RelayState" value="${RelayState}"/>
+                #end
+
+                <input type="hidden" name="SAMLart" value="${SAMLArt}"/>
+            </div>
+            <noscript>
+                <div>
+                    <input type="submit" value="Continue"/>
+                </div>
+            </noscript>
+        </form>
+        #parse ( "/templates/add-html-body-content.vm" )
+    </body>
+</html>
diff --git a/ROOT/dotserver/tomcat-8.5.32/webapps/ROOT/WEB-INF/velocity/templates/saml2-post-binding.vm b/ROOT/dotserver/tomcat-8.5.32/webapps/ROOT/WEB-INF/velocity/templates/saml2-post-binding.vm
@@ -0,0 +1,42 @@
+##
+## Velocity Template for SAML 2 HTTP-POST binding
+##
+## Velocity context may contain the following properties
+## action - String - the action URL for the form
+## binding - String - the SAML binding type in use
+## RelayState - String - the relay state for the message
+## SAMLRequest - String - the Base64 encoded SAML Request
+## SAMLResponse - String - the Base64 encoded SAML Response
+##
+<!DOCTYPE html>
+<html>
+    <head>
+        <meta charset="utf-8" />
+        #parse ( "/templates/add-html-head-content.vm" )
+    </head>
+    <body onload="document.forms[0].submit()">
+        <noscript>
+            <p>
+                <strong>Note:</strong> Since your browser does not support JavaScript,
+                you must press the Continue button once to proceed.
+            </p>
+        </noscript>
+
+        <form action="${action}" method="post">
+            <div>
+                #if($RelayState)<input type="hidden" name="RelayState" value="${RelayState}"/>#end
+
+                #if($SAMLRequest)<input type="hidden" name="SAMLRequest" value="${SAMLRequest}"/>#end
+
+                #if($SAMLResponse)<input type="hidden" name="SAMLResponse" value="${SAMLResponse}"/>#end
+
+            </div>
+            <noscript>
+                <div>
+                    <input type="submit" value="Continue"/>
+                </div>
+            </noscript>
+        </form>
+        #parse ( "/templates/add-html-body-content.vm" )
+    </body>
+</html>
diff --git a/...er/tomcat-8.5.32/webapps/ROOT/WEB-INF/velocity/templates/saml2-post-simplesign-binding.vm b/...er/tomcat-8.5.32/webapps/ROOT/WEB-INF/velocity/templates/saml2-post-simplesign-binding.vm
@@ -0,0 +1,52 @@
+##
+## Velocity Template for SAML 2 HTTP-POST-SimpleSign binding
+##
+## Velocity context may contain the following properties
+## action - String - the action URL for the form
+## binding - String - the SAML binding type in use
+## RelayState - String - the relay state for the message
+## SAMLRequest - String - the Base64 encoded SAML Request
+## SAMLResponse - String - the Base64 encoded SAML Response
+## Signature - String - the Base64 encoded simple signature
+## SigAlg - String - the signature algorithm URI
+## KeyInfo - String - the Base64 encoded ds:KeyInfo (optional)
+##
+<!DOCTYPE html>
+<html>
+    <head>
+        <meta charset="utf-8" />
+        #parse ( "/templates/add-html-head-content.vm" )
+    </head>
+    <body onload="document.forms[0].submit()">
+        <noscript>
+            <p>
+                <strong>Note:</strong> Since your browser does not support JavaScript,
+                you must press the Continue button once to proceed.
+            </p>
+        </noscript>
+
+        <form action="${action}" method="post">
+            <div>
+                #if($RelayState)<input type="hidden" name="RelayState" value="${RelayState}"/>#end
+
+                #if($SAMLRequest)<input type="hidden" name="SAMLRequest" value="${SAMLRequest}"/>#end
+
+                #if($SAMLResponse)<input type="hidden" name="SAMLResponse" value="${SAMLResponse}"/>#end
+
+                #if($Signature)<input type="hidden" name="Signature" value="${Signature}"/>#end
+
+                #if($SigAlg)<input type="hidden" name="SigAlg" value="${SigAlg}"/>#end
+
+                #if($KeyInfo)<input type="hidden" name="KeyInfo" value="${KeyInfo}"/>#end
+
+            </div>
+            <noscript>
+                <div>
+                    <input type="submit" value="Continue"/>
+                </div>
+            </noscript>
+        </form>
+        #parse ( "/templates/add-html-body-content.vm" )
+
+    </body>
+</html>
diff --git a/build.gradle b/build.gradle
@@ -0,0 +1,13 @@
+apply plugin: 'java'
+
+repositories {
+    maven { url "http://repo.dotcms.com/artifactory/libs-release" }
+}
+
+dependencies {
+    compile('com.dotcms:dotcms:5.3.4.1') { transitive = true }
+    compile fileTree(dir: 'ROOT/dotserver/tomcat-8.5.32/webapps/ROOT/WEB-INF/lib', include: ['*.jar'])
+}
+
+sourceSets.main.java.srcDirs += ['src']
+
diff --git a/src/com/dotcms/plugin/saml/v3/beans/AttributesBean.java b/src/com/dotcms/plugin/saml/v3/beans/AttributesBean.java
@@ -13,6 +13,7 @@
  * 
  * @author jsanca
  */
+// Migrated
 public class AttributesBean implements Serializable
 {
 	private static final long serialVersionUID = 1836313856887837731L;

diff --git a/src/com/dotcms/plugin/saml/v3/cache/SamlCache.java b/src/com/dotcms/plugin/saml/v3/cache/SamlCache.java
@@ -16,6 +16,7 @@
  * @version 4.3.2
  * @since 03-27-2018
  */
+// Not-need
 public abstract class SamlCache implements Cachable
 {
 	protected static final String DEFAULT = "default";

diff --git a/src/com/dotcms/plugin/saml/v3/cache/SamlCacheImpl.java b/src/com/dotcms/plugin/saml/v3/cache/SamlCacheImpl.java
@@ -31,6 +31,7 @@
  * @version 4.3.2
  * @since 03-27-2018
  */
+// Not-need
 public class SamlCacheImpl extends SamlCache
 {
 	protected DotCacheAdministrator cache = null;

diff --git a/src/com/dotcms/plugin/saml/v3/config/CredentialHelper.java b/src/com/dotcms/plugin/saml/v3/config/CredentialHelper.java
@@ -5,6 +5,7 @@
 import com.dotcms.plugin.saml.v3.parameters.DotsamlPropertyName;
 import com.dotcms.plugin.saml.v3.util.InstanceUtil;
 
+// Migrated
 public class CredentialHelper
 {
 	/**

diff --git a/src/com/dotcms/plugin/saml/v3/config/CredentialProvider.java b/src/com/dotcms/plugin/saml/v3/config/CredentialProvider.java
@@ -11,6 +11,7 @@
  * 
  * @author jsanca
  */
+// Migrated
 public interface CredentialProvider extends Serializable
 {
 	/**
@@ -20,4 +21,3 @@ public interface CredentialProvider extends Serializable
 	 */
 	Credential createCredential();
 }
-
diff --git a/src/com/dotcms/plugin/saml/v3/config/IdpConfig.java b/src/com/dotcms/plugin/saml/v3/config/IdpConfig.java
@@ -6,6 +6,7 @@
 import java.util.Properties;
 import java.util.stream.Collectors;
 
+// TODO: partially migrated
 public class IdpConfig
 {
 	private String id;

diff --git a/src/com/dotcms/plugin/saml/v3/config/IdpConfigComparator.java b/src/com/dotcms/plugin/saml/v3/config/IdpConfigComparator.java
@@ -2,6 +2,7 @@
 
 import java.util.Comparator;
 
+// todo: not migrated yet
 public class IdpConfigComparator implements Comparator<IdpConfig>
 {
 	@Override

diff --git a/src/com/dotcms/plugin/saml/v3/config/IdpConfigFileHelper.java b/src/com/dotcms/plugin/saml/v3/config/IdpConfigFileHelper.java
@@ -12,6 +12,7 @@
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
 
+// todo: not migrated
 public class IdpConfigFileHelper implements Serializable
 {
 	private static final long serialVersionUID = 2810853018482556705L;

diff --git a/src/com/dotcms/plugin/saml/v3/config/IdpConfigHelper.java b/src/com/dotcms/plugin/saml/v3/config/IdpConfigHelper.java
@@ -2,9 +2,8 @@
 
 import com.dotcms.plugin.saml.v3.cache.SamlCache;
 
-import com.dotmarketing.business.CacheLocator;
+import com.dotcms.plugin.saml.v3.cache.SamlCacheImpl;
 import com.dotmarketing.exception.DotDataException;
-import com.dotmarketing.util.Logger;
 import com.dotmarketing.util.UUIDGenerator;
 import com.dotmarketing.util.UtilMethods;
 import com.dotmarketing.util.json.JSONException;
@@ -17,6 +16,7 @@
 import java.util.List;
 import java.util.Map;
 
+// todo: partially migrated
 public class IdpConfigHelper extends IdpConfigFileHelper implements Serializable
 {
 	private static class SingletonHolder
@@ -31,7 +31,7 @@ public static IdpConfigHelper getInstance()
 		return IdpConfigHelper.SingletonHolder.INSTANCE;
 	}
 
-	private SamlCache samlCache = CacheLocator.getSamlCache();
+	private SamlCache samlCache = new SamlCacheImpl();
 
 	public IdpConfigHelper()
 	{

diff --git a/src/com/dotcms/plugin/saml/v3/config/IdpConfigWriterReader.java b/src/com/dotcms/plugin/saml/v3/config/IdpConfigWriterReader.java
@@ -14,6 +14,7 @@
 import java.util.List;
 import java.util.Map;
 
+// todo: not migrated
 public class IdpConfigWriterReader
 {
 	public static final String IDP_CONFIGS = "samlConfigs";

diff --git a/src/com/dotcms/plugin/saml/v3/config/IdpJsonTransformer.java b/src/com/dotcms/plugin/saml/v3/config/IdpJsonTransformer.java
@@ -10,6 +10,7 @@
 import java.util.Iterator;
 import java.util.Properties;
 
+// todo: not migrated
 public class IdpJsonTransformer
 {
 	private static String getCanonicalPathIfExists( File file ) throws IOException

diff --git a/src/com/dotcms/plugin/saml/v3/config/MetaDataHelper.java b/src/com/dotcms/plugin/saml/v3/config/MetaDataHelper.java
@@ -20,6 +20,7 @@
  * @version 4.3.2
  * @since 03-31-2018
  */
+// todo: not migrated yet
 public class MetaDataHelper {
 	/**
 	 * Gets the metadata, null if it can not be created.

diff --git a/src/com/dotcms/plugin/saml/v3/config/OptionalPropertiesHelper.java b/src/com/dotcms/plugin/saml/v3/config/OptionalPropertiesHelper.java
@@ -13,6 +13,7 @@
  * @version 4.3.2
  * @since 03-31-2018
  */
+// todo; not migrated
 public class OptionalPropertiesHelper
 {
 	/**

diff --git a/src/com/dotcms/plugin/saml/v3/config/SamlSiteValidator.java b/src/com/dotcms/plugin/saml/v3/config/SamlSiteValidator.java
@@ -8,6 +8,7 @@
  * 
  * @author jsanca
  */
+// todo: not migrated yet
 public class SamlSiteValidator
 {
 	public static boolean checkBuildRoles( final String buildRolesProperty )

diff --git a/src/com/dotcms/plugin/saml/v3/config/SiteJsonTransformer.java b/src/com/dotcms/plugin/saml/v3/config/SiteJsonTransformer.java
@@ -8,6 +8,7 @@
 import java.util.Iterator;
 import java.util.Map;
 
+// todo: not migrated
 public class SiteJsonTransformer
 {
 	public static JSONObject getJsonObjecFromtMap( Map<String, String> map ) throws JSONException

diff --git a/src/com/dotcms/plugin/saml/v3/exception/AttributesNotFoundException.java b/src/com/dotcms/plugin/saml/v3/exception/AttributesNotFoundException.java
@@ -4,6 +4,7 @@
  * Runtime exception used to handle errors when attributes might not be
  * extracted from the Assertion object Created by nollymar on 3/15/17.
  */
+// migrated
 public class AttributesNotFoundException extends RuntimeException
 {
 	private static final long serialVersionUID = 4345557895408407837L;

diff --git a/src/com/dotcms/plugin/saml/v3/exception/DotSamlException.java b/src/com/dotcms/plugin/saml/v3/exception/DotSamlException.java
@@ -5,6 +5,7 @@
  * 
  * @author jsanca
  */
+// migrated
 public class DotSamlException extends RuntimeException
 {
 	private static final long serialVersionUID = -3569526825729783600L;

diff --git a/src/com/dotcms/plugin/saml/v3/exception/NotNullEmailAllowedException.java b/src/com/dotcms/plugin/saml/v3/exception/NotNullEmailAllowedException.java
@@ -2,6 +2,7 @@
 
 import javax.servlet.http.HttpServletResponse;
 
+// migrated
 public class NotNullEmailAllowedException extends AttributesNotFoundException
 {
 	private static final long serialVersionUID = -3622432364873488814L;

diff --git a/src/com/dotcms/plugin/saml/v3/exception/SamlUnauthorizedException.java b/src/com/dotcms/plugin/saml/v3/exception/SamlUnauthorizedException.java
@@ -7,6 +7,7 @@
  * 
  * @author jsanca
  */
+// migrated
 public class SamlUnauthorizedException extends DotSamlException
 {
 	private static final long serialVersionUID = 2827175662161844965L;

diff --git a/src/com/dotcms/plugin/saml/v3/filter/AutoLoginResult.java b/src/com/dotcms/plugin/saml/v3/filter/AutoLoginResult.java
@@ -2,6 +2,7 @@
 
 import javax.servlet.http.HttpSession;
 
+// todo:  migrated
 public class AutoLoginResult
 {
 	private final HttpSession session;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		## Stub file that one can replace with Velocity template (and thus HTML) content
		## to be placed into the BODY section of the response
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		## Stub file that one can replace with Velocity template (and thus HTML) content
		## to be placed into the HEAD section of the response