SAK-30527

aagrandaz · Mar 21, 2016 · 74ca973 · 74ca973
1 parent 3c12fbe
commit 74ca973
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 18 deletions.
diff --git a/.../configuration/bundles/src/bundle/org/sakaiproject/config/bundle/default.sakai.properties b/.../configuration/bundles/src/bundle/org/sakaiproject/config/bundle/default.sakai.properties
@@ -2107,7 +2107,7 @@
 # You should understand the security implications of this before enabling.
 # Note that you can create custom macros that expose properties but they need to be specified in this list
 # DEFAULT: ${USER_ID},${USER_EID},${USER_FIRST_NAME},${USER_LAST_NAME},${SITE_ID},${USER_ROLE}
-# iframe.allowed.macros=${USER_ID},${USER_EID},${USER_FIRST_NAME},${USER_LAST_NAME},${SITE_ID},${USER_ROLE},${SESSION_ID},${SITE_PROP:course-unique-id},${SITE_PROP:course-section-key}
+# iframe.allowed.macros=${USER_ID},${USER_EID},${USER_FIRST_NAME},${USER_LAST_NAME},${SITE_ID},${USER_ROLE},${SITE_PROP:course-unique-id},${SITE_PROP:course-section-key}
 
 # PAGE ORDER HELPER
 # List of tool IDs that if present in a page prevent the page's title from being edited.

diff --git a/kernel/kernel-impl/src/main/java/org/sakaiproject/content/impl/BaseContentService.java b/kernel/kernel-impl/src/main/java/org/sakaiproject/content/impl/BaseContentService.java
@@ -14218,7 +14218,6 @@ public void expandZippedResource(String resourceId) throws Exception {
 	private static final String MACRO_USER_EID            = "${USER_EID}";
 	private static final String MACRO_USER_FIRST_NAME     = "${USER_FIRST_NAME}";
 	private static final String MACRO_USER_LAST_NAME      = "${USER_LAST_NAME}";
-	private static final String MACRO_SESSION_ID          = "${SESSION_ID}";
 
 	private static final String MACRO_DEFAULT_ALLOWED = "${USER_ID},${USER_EID},${USER_FIRST_NAME},${USER_LAST_NAME}";
 
@@ -14282,10 +14281,6 @@ private String getMacroValue(String macroName) {
 			if (macroName.equals(MACRO_USER_LAST_NAME)) {
 				return userDirectoryService.getCurrentUser().getLastName();
 			}
-			if (macroName.equals(MACRO_SESSION_ID)) {
-				return sessionManager.getCurrentSession().getId();
-			}
-
 		}
 		catch (Exception e) {
 			M_log.error("Error resolving macro:" + macroName + ": " + e.getClass() + ": " + e.getCause());

diff --git a/web/web-portlet/src/java/org/sakaiproject/portlets/PortletIFrame.java b/web/web-portlet/src/java/org/sakaiproject/portlets/PortletIFrame.java
@@ -176,8 +176,6 @@ public class PortletIFrame extends GenericPortlet {
     protected static final String MACRO_USER_LAST_NAME      = "${USER_LAST_NAME}";
     /** Macro name: Role */
     protected static final String MACRO_USER_ROLE           = "${USER_ROLE}";
-    /** Macro name: Session */
-    protected static final String MACRO_SESSION_ID          = "${SESSION_ID}";
 
     private static final String MACRO_CLASS_SITE_PROP = "SITE_PROP:";
 
@@ -1236,10 +1234,6 @@ private String getMacroValue(String macroName)
 			{
 				return this.getUserRole();
 			}
-			if (macroName.equals(MACRO_SESSION_ID))
-			{
-				return this.getSessionId();
-			}
 
 			if (macroName.startsWith("${"+MACRO_CLASS_SITE_PROP)) 
 			{

diff --git a/web/web-tool/tool/src/java/org/sakaiproject/web/tool/IFrameAction.java b/web/web-tool/tool/src/java/org/sakaiproject/web/tool/IFrameAction.java
@@ -181,8 +181,6 @@ public class IFrameAction extends VelocityPortletPaneledAction
 	protected static final String MACRO_USER_LAST_NAME      = "${USER_LAST_NAME}";
 	/** Macro name: Role */
 	protected static final String MACRO_USER_ROLE           = "${USER_ROLE}";
-	/** Macro name: Session */
-	protected static final String MACRO_SESSION_ID          = "${SESSION_ID}";
 
 	private static final String MACRO_CLASS_SITE_PROP = "SITE_PROP:";
 
@@ -659,10 +657,6 @@ private String getMacroValue(String macroName)
 			{
 				return this.getUserRole();
 			}
-			if (macroName.equals(MACRO_SESSION_ID))
-			{
-				return this.getSessionId();
-			}
 
 			if (macroName.startsWith("${"+MACRO_CLASS_SITE_PROP)) 
 			{