<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0" /> <base href="https://issues.shibboleth.net/jira" />
<title>Message Title</title>
</head>
<body class="jira" style="color: #333; font-family: Arial, sans-serif; font-size: 14px; line-height: 1.429">
<table id="background-table" cellpadding="0" cellspacing="0" width="100%" style="border-collapse: collapse; mso-table-lspace: 0pt; mso-table-rspace: 0pt; background-color: #f5f5f5; border-collapse: collapse; mso-table-lspace: 0pt; mso-table-rspace: 0pt">
<!-- header here -->
<tr>
<td id="header-pattern-container" style="padding: 0px; border-collapse: collapse; padding: 10px 20px">
<table id="header-pattern" cellspacing="0" cellpadding="0" border="0" style="border-collapse: collapse; mso-table-lspace: 0pt; mso-table-rspace: 0pt">
<tr>
<td id="header-avatar-image-container" valign="top" style="padding: 0px; border-collapse: collapse; vertical-align: top; width: 32px; padding-right: 8px"> <img id="header-avatar-image" class="image_fix" src="cid:jira-generated-image-avatar-zccx04fxbfekk/ldylvfqohcyf4=@https://aai-logon.switch.ch/idp/shibboleth-fa76c6d1-0712-4b6a-9005-e7b7e7a83da9" height="32" width="32" border="0" style="border-radius: 3px; vertical-align: top" />
</td>
<td id="header-text-container" valign="middle" style="padding: 0px; border-collapse: collapse; vertical-align: middle; font-family: Arial, sans-serif; font-size: 14px; line-height: 20px; mso-line-height-rule: exactly; mso-text-raise: 1px"> <a class="user-hover" rel="zccx04fxbfekk/ldylvfqohcyf4=@https://aai-logon.switch.ch/idp/shibboleth" id="email_zccx04fxbfekk/ldylvfqohcyf4=@https://aai-logon.switch.ch/idp/shibboleth" href="https://issues.shibboleth.net/jira/secure/ViewProfile.jspa?name=zccx04fxbfekk%2Fldylvfqohcyf4%3D%40https%3A%2F%2Faai-logon.switch.ch%2Fidp%2Fshibboleth" style="color:#3b73af;; color: #3b73af; text-decoration: none">Kaspar Brand</a> <strong>commented</strong> on <a href="https://issues.shibboleth.net/jira/browse/IDP-727" style="color: #3b73af; text-decoration: none"><img src="cid:jira-generated-image-static-improvement-e9f8e096-0b1d-425c-8c8d-9e2a6ecd1386" height="16" width="16" border="0" align="absmiddle" alt="Improvement" /> IDP-727</a>
</td>
</tr>
</table>
</td>
</tr>
<tr>
<td id="email-content-container" style="padding: 0px; border-collapse: collapse; padding: 0 20px">
<table id="email-content-table" cellspacing="0" cellpadding="0" border="0" width="100%" style="border-collapse: collapse; mso-table-lspace: 0pt; mso-table-rspace: 0pt; border-spacing: 0; border-collapse: separate">
<tr>
<!-- there needs to be content in the cell for it to render in some clients -->
<td class="email-content-rounded-top mobile-expand" style="padding: 0px; border-collapse: collapse; color: #fff; padding: 0 15px 0 16px; height: 15px; background-color: #fff; border-left: 1px solid #ccc; border-top: 1px solid #ccc; border-right: 1px solid #ccc; border-bottom: 0; border-top-right-radius: 5px; border-top-left-radius: 5px; height: 10px; line-height: 10px; padding: 0 15px 0 16px; mso-line-height-rule: exactly">
</td>
</tr>
<tr>
<td class="email-content-main mobile-expand " style="padding: 0px; border-collapse: collapse; border-left: 1px solid #ccc; border-right: 1px solid #ccc; border-top: 0; border-bottom: 0; padding: 0 15px 0 16px; background-color: #fff">
<table class="page-title-pattern" cellspacing="0" cellpadding="0" border="0" width="100%" style="border-collapse: collapse; mso-table-lspace: 0pt; mso-table-rspace: 0pt">
<tr>
<td style="vertical-align: top;; padding: 0px; border-collapse: collapse; padding-right: 5px; font-size: 20px; line-height: 30px; mso-line-height-rule: exactly" class="page-title-pattern-header-container"> <span class="page-title-pattern-header" style="font-family: Arial, sans-serif; padding: 0; font-size: 20px; line-height: 30px; mso-text-raise: 2px; mso-line-height-rule: exactly; vertical-align: middle"> <a href="https://issues.shibboleth.net/jira/browse/IDP-727" style="color: #3b73af; text-decoration: none">Re: Add an installer option for disabling the "shibboleth_jsp" servlet (/shibboleth URL serving the IdP's metadata)</a> </span>
</td>
</tr>
</table>
</td>
</tr>
<tr>
<td id="text-paragraph-pattern-top" class="email-content-main mobile-expand comment-top-pattern" style="padding: 0px; border-collapse: collapse; border-left: 1px solid #ccc; border-right: 1px solid #ccc; border-top: 0; border-bottom: 0; padding: 0 15px 0 16px; background-color: #fff; border-bottom: none; padding-bottom: 0">
<table class="text-paragraph-pattern" cellspacing="0" cellpadding="0" border="0" width="100%" style="border-collapse: collapse; mso-table-lspace: 0pt; mso-table-rspace: 0pt; font-family: Arial, sans-serif; font-size: 14px; line-height: 20px; mso-line-height-rule: exactly; mso-text-raise: 2px">
<tr>
<td class="text-paragraph-pattern-container mobile-resize-text " style="padding: 0px; border-collapse: collapse; padding: 0 0 10px 0">
<p style="margin: 10px 0 0 0">I would appreciate if we could agree on renaming the property - as explained before, both <tt>idp.no.metadata</tt> and <tt>idp.metadata.enabled</tt> in 3.2 would be rather unfortunate for our installation guide, which our community is now using for deploying 3.1.1.</p>
<p style="margin: 10px 0 0 0">I.e., for the first part, I suggest this change:</p>
<div class="code panel" style="border-width: 1px;; border: 1px solid #ccc; background: #f5f5f5; font-size: 12px; line-height: 1.333; font-family: monospace; border: 1px solid #ccc; -moz-border-radius: 3px 3px 3px 3px; border-radius: 3px 3px 3px 3px; margin: 9px 0">
<div class="codeContent panelContent" style="padding: 9px 12px">
<pre class="code-java" style="margin: 10px 0 0 0; max-height: 30em; overflow: auto; white-space: pre-wrap; word-wrap: normal">
Index: idp-conf/src/main/resources/conf/idp.properties
===================================================================
--- idp-conf/src/main/resources/conf/idp.properties (revision 7576)
+++ idp-conf/src/main/resources/conf/idp.properties (working copy)
@@ -169,7 +169,7 @@
idp.ui.fallbackLanguages=en,fr,de
# Whether to serve our metadata out at /idp/shibboleth
-# idp.no.metadata=<span class="code-keyword" style="color: #000091">false</span>
+# idp.entityID.url.disable=<span class="code-keyword" style="color: #000091">false</span>
# Storage service used by CAS protocol
# Defaults to shibboleth.StorageService (in-memory)
Index: idp-war/src/main/webapp/WEB-INF/jsp/metadata.jsp
===================================================================
--- idp-war/src/main/webapp/WEB-INF/jsp/metadata.jsp (revision 7576)
+++ idp-war/src/main/webapp/WEB-INF/jsp/metadata.jsp (working copy)
@@ -2,7 +2,7 @@
<span class="code-keyword" style="color: #000091">final</span> org.springframework.web.context.WebApplicationContext springContext =
org.springframework.web.context.support.WebApplicationContextUtils.getRequiredWebApplicationContext(request.getServletContext());
<span class="code-keyword" style="color: #000091">final</span> <span class="code-object" style="color: #910091">String</span> path = springContext.getEnvironment().getProperty(<span class="code-quote" style="color: #009100">"idp.home"</span>) + <span class="code-quote" style="color: #009100">"/metadata/idp-metadata.xml"</span>;
-<span class="code-keyword" style="color: #000091">final</span> <span class="code-object" style="color: #910091">String</span> noMetadata = springContext.getEnvironment().getProperty(<span class="code-quote" style="color: #009100">"idp.no.metadata"</span>);
+<span class="code-keyword" style="color: #000091">final</span> <span class="code-object" style="color: #910091">String</span> noMetadata = springContext.getEnvironment().getProperty(<span class="code-quote" style="color: #009100">"idp.entityID.url.disable"</span>);
<span class="code-keyword" style="color: #000091">if</span> (<span class="code-keyword" style="color: #000091">null</span> != noMetadata && <span class="code-object" style="color: #910091">Boolean</span>.valueOf(noMetadata.trim())) {
response.sendError(404);
</pre>
</div>
</div>
<p style="margin: 10px 0 0 0">As far as the second point (Java 1.6 source level compatibility) is concerned, would something like this address the concern of the resource not being closed in exceptional cases? </p>
<div class="code panel" style="border-width: 1px;; border: 1px solid #ccc; background: #f5f5f5; font-size: 12px; line-height: 1.333; font-family: monospace; border: 1px solid #ccc; -moz-border-radius: 3px 3px 3px 3px; border-radius: 3px 3px 3px 3px; margin: 9px 0">
<div class="codeContent panelContent" style="padding: 9px 12px">
<pre class="code-java" style="margin: 10px 0 0 0; max-height: 30em; overflow: auto; white-space: pre-wrap; word-wrap: normal">
--- metadata.jsp (revision 7576)
+++ metadata.jsp (working copy)
@@ -7,14 +7,18 @@
<span class="code-keyword" style="color: #000091">if</span> (<span class="code-keyword" style="color: #000091">null</span> != noMetadata && <span class="code-object" style="color: #910091">Boolean</span>.valueOf(noMetadata.trim())) {
response.sendError(404);
} <span class="code-keyword" style="color: #000091">else</span> {
- <span class="code-keyword" style="color: #000091">try</span> (<span class="code-keyword" style="color: #000091">final</span> java.io.FileInputStream in = <span class="code-keyword" style="color: #000091">new</span> java.io.FileInputStream(path)) {
+ <span class="code-keyword" style="color: #000091">final</span> java.io.FileInputStream in = <span class="code-keyword" style="color: #000091">new</span> java.io.FileInputStream(path);
+ <span class="code-keyword" style="color: #000091">try</span> {
<span class="code-object" style="color: #910091">int</span> i;
<span class="code-keyword" style="color: #000091">while</span> ((i = in.read()) != -1) {
out.write(i);
}
} <span class="code-keyword" style="color: #000091">catch</span> (<span class="code-keyword" style="color: #000091">final</span> java.io.IOException e) {
+ <span class="code-keyword" style="color: #000091">if</span> (in != <span class="code-keyword" style="color: #000091">null</span>) in.close();
out.println(e.getMessage());
<span class="code-keyword" style="color: #000091">return</span>;
+ } <span class="code-keyword" style="color: #000091">finally</span> {
+ in.close();
}
<span class="code-keyword" style="color: #000091">final</span> <span class="code-object" style="color: #910091">String</span> acceptHeader = request.getHeader(<span class="code-quote" style="color: #009100">"Accept"</span>);
</pre>
</div>
</div>
<p style="margin: 10px 0 0 0">(Again, I gladly defer to the real Java programmers for a better solution.) </p>
</td>
</tr>
</table>
</td>
</tr>
<tr>
<td class="email-content-main mobile-expand " style="padding: 0px; border-collapse: collapse; border-left: 1px solid #ccc; border-right: 1px solid #ccc; border-top: 0; border-bottom: 0; padding: 0 15px 0 16px; background-color: #fff">
<table id="actions-pattern" cellspacing="0" cellpadding="0" border="0" width="100%" style="border-collapse: collapse; mso-table-lspace: 0pt; mso-table-rspace: 0pt; font-family: Arial, sans-serif; font-size: 14px; line-height: 20px; mso-line-height-rule: exactly; mso-text-raise: 1px">
<tr>
<td id="actions-pattern-container" valign="middle" style="padding: 0px; border-collapse: collapse; padding: 10px 0 10px 24px; vertical-align: middle; padding-left: 0">
<table align="left" style="border-collapse: collapse; mso-table-lspace: 0pt; mso-table-rspace: 0pt">
<tr>
<td class="actions-pattern-action-icon-container" style="padding: 0px; border-collapse: collapse; font-family: Arial, sans-serif; font-size: 14px; line-height: 20px; mso-line-height-rule: exactly; mso-text-raise: 0px; vertical-align: middle"> <a href="https://issues.shibboleth.net/jira/browse/IDP-727#add-comment" target="_blank" title="Add Comment" style="color: #3b73af; text-decoration: none"> <img class="actions-pattern-action-icon-image" src="cid:jira-generated-image-static-comment-icon-fcbcab3e-2acb-429b-a9c0-390327fbcafd" alt="Add Comment" title="Add Comment" height="16" width="16" border="0" style="vertical-align: middle" /> </a>
</td>
<td class="actions-pattern-action-text-container" style="padding: 0px; border-collapse: collapse; font-family: Arial, sans-serif; font-size: 14px; line-height: 20px; mso-line-height-rule: exactly; mso-text-raise: 4px; padding-left: 5px"> <a href="https://issues.shibboleth.net/jira/browse/IDP-727#add-comment" target="_blank" title="Add Comment" style="color: #3b73af; text-decoration: none">Add Comment</a>
</td>
</tr>
</table>
</td>
</tr>
</table>
</td>
</tr>
<!-- there needs to be content in the cell for it to render in some clients -->
<tr>
<td class="email-content-rounded-bottom mobile-expand" style="padding: 0px; border-collapse: collapse; color: #fff; padding: 0 15px 0 16px; height: 5px; line-height: 5px; background-color: #fff; border-top: 0; border-left: 1px solid #ccc; border-bottom: 1px solid #ccc; border-right: 1px solid #ccc; border-bottom-right-radius: 5px; border-bottom-left-radius: 5px; mso-line-height-rule: exactly">
</td>
</tr>
</table>
</td>
</tr>
<tr>
<td id="footer-pattern" style="padding: 0px; border-collapse: collapse; padding: 12px 20px">
<table id="footer-pattern-container" cellspacing="0" cellpadding="0" border="0" style="border-collapse: collapse; mso-table-lspace: 0pt; mso-table-rspace: 0pt">
<tr>
<td id="footer-pattern-text" class="mobile-resize-text" width="100%" style="padding: 0px; border-collapse: collapse; color: #999; font-size: 12px; line-height: 18px; font-family: Arial, sans-serif; mso-line-height-rule: exactly; mso-text-raise: 2px">
This message was sent by Atlassian JIRA <span id="footer-build-information">(v6.4.1#64016-<span title="5d7581434f35c063b7031942e62ed4d72a97fa9c" data-commit-id="5d7581434f35c063b7031942e62ed4d72a97fa9c}">sha1:5d75814</span>)</span>
</td>
<td id="footer-pattern-logo-desktop-container" valign="top" style="padding: 0px; border-collapse: collapse; padding-left: 20px; vertical-align: top">
<table style="border-collapse: collapse; mso-table-lspace: 0pt; mso-table-rspace: 0pt">
<tr>
<td id="footer-pattern-logo-desktop-padding" style="padding: 0px; border-collapse: collapse; padding-top: 3px"> <img id="footer-pattern-logo-desktop" src="cid:jira-generated-image-static-footer-desktop-logo-7ab01cf0-2413-4206-b7eb-377d1de59577" alt="Atlassian logo" title="Atlassian logo" width="169" height="36" class="image_fix" />
</td>
</tr>
</table>
</td>
</tr>
</table>
</td>
</tr>
</table>
</body>
</html>