Merge pull request #55 from bmhm/SHIRO-678
[SHIRO-678] Add charset hint for authentication data like passwords.
diff --git a/articles.md b/articles.md
index a051d7a..65560fb 100644
--- a/articles.md
+++ b/articles.md
@@ -32,8 +32,6 @@
* **[Custom Apache Shiro JDBC Realm](https://mehmetceliksoy.wordpress.com/2015/06/28/shiro-jdbc-realm/)** by Mehmet Celiksoy
-* **[Spring MVC + Shiro + myBatis + JSR-303 Validation](https://bubba-h57.github.io/H57_Shiro/)** by Rob Hines et. al. on 2 April 2012.
-
* **[Securing ZK Applications with Apache Shiro](https://www.zkoss.org/wiki/Small_Talks/2012/March/Securing_ZK_Applications_With_Apache_Shiro)** by Ashish Dasnurkar on 6 March 2012.
* **Facebook Login with Apache Shiro** by Mike Warren on 28 November 2011
@@ -53,8 +51,6 @@
* **[Apache Shiro Support for Mule](http://blogs.mulesoft.com/dev/mule-dev/apache-shiro-support-for-mule/)** by Dan Diephouse on 10 January 2011.
-* **[Apache Shiro on Google AppEngine](http://www.gdevelop.com/blog/2010/12/apache-shiro-on-appengine)** by Trung on 13 December 2010.
-
* **[Apache Shiro tags for JSF - Securing Your JSF Pages](http://techbeats.deluan.com/apache-shiro-tags-for-jsffacelets)** by Deluan Quintão on 1 November 2010.
* **Shiro DevNexus 2009 Presentation** by Jeremy Haile: ([PDF](assets/images/articles/Ki-DevNexus-2009.pdf?version=1&modificationDate=1246602947000)) ([Keynote](assets/images/articles/Ki-DevNexus-2009.key.zip?version=1&modificationDate=1246602947000)) ([Powerpoint](assets/images/articles/Ki-DevNexus-2009.ppt.zip?version=1&modificationDate=1246602947000))
diff --git a/download.html.vtl b/download.html.vtl
index f851756..2711023 100644
--- a/download.html.vtl
+++ b/download.html.vtl
@@ -55,9 +55,9 @@
<h3>Code Signatures</h3>
-<p>You may <a class="external-link" href="http://www.apache.org/dev/release-signing.html#verifying-signature">verify the
+<p>You may <a class="external-link" href="https://infra.apache.org/release-signing.html#verifying-signature">verify the
authenticity</a> of all artifacts below by using the PGP <a class="external-link"
- href="http://www.apache.org/dist/shiro/KEYS">KEYS</a>
+ href="https://downloads.apache.org/shiro/KEYS">KEYS</a>
file. </p>
<h3>Releases</h3>
@@ -72,16 +72,6 @@
<li><a href="#latestGit">${latestRelease} Git Source repository</a></li>
</ul>
</li>
- #if( $earlyRelease )
- <li>
- <a href="#early">Early Access Release (${earlyRelease})</a>
- <ul>
- <li><a href="#earlyBinary">${earlyRelease} Binary Distribution</a></li>
- <li><a href="#earlySource">${earlyRelease} Source Code Distribution</a></li>
- <li><a href="#earlyGit">${earlyRelease} Git Source repository</a></li>
- </ul>
- </li>
- #end
<li><a href="#previous">Previous Releases</a>
<ul>
@@ -139,11 +129,11 @@
<p>The source bundle requires JDK 1.8 and Maven 3.0.3+ to build:</p>
-<p><a class="external-link" href="http://www.apache.org/dyn/closer.cgi/shiro/${latestRelease}/shiro-root-${latestRelease}-source-release.zip">zip</a>
+<p><a class="external-link" href="https://downloads.apache.org/shiro/${latestRelease}/shiro-root-${latestRelease}-source-release.zip">zip</a>
(<a class="external-link"
- href="http://www.apache.org/dyn/closer.cgi/shiro/${latestRelease}/shiro-root-${latestRelease}-source-release.zip.asc">pgp</a>, <a
+ href="https://downloads.apache.org/shiro/${latestRelease}/shiro-root-${latestRelease}-source-release.zip.asc">pgp</a>, <a
class="external-link"
- href="http://www.apache.org/dyn/closer.cgi/shiro/${latestRelease}/shiro-root-${latestRelease}-source-release.zip.sha512">sha512</a>)
+ href="https://downloads.apache.org/${latestRelease}/shiro-root-${latestRelease}-source-release.zip.sha512">sha512</a>)
</p>
<h3><a name="latestGit"></a>${latestRelease} Git Source repository</h3>
@@ -155,39 +145,6 @@
</pre>
-<h2><a name="early"></a>Early Access Release (${earlyRelease})</h2>
-<h3><a name="earlyBinary"></a>${earlyRelease} Binary Distribution</h3>
-
-<p>Associated documentation can be found <a href="documentation.html" title="Documentation">here</a></p>
-
-<p>To download the files directly as one .jar file just click the link in the "Artifact" column. If you would like
- acquire Shiro through Maven, then please use the markup listed under "Maven Usage"</p>
-
-<p>
-</p>
-
-#artifactTable($shiro15xSnapshot)
-
-<h3><a name="earlySource"></a>${earlyRelease} Source Code Distribution</h3>
-
-<p>The source bundle requires JDK 1.8 and Maven 3.0.3+ to build:</p>
-
-<p><a class="external-link" href="http://www.apache.org/dyn/closer.cgi/shiro/${earlyRelease}/shiro-root-${earlyRelease}-source-release.zip">zip</a>
- (<a class="external-link"
- href="http://www.apache.org/dyn/closer.cgi/shiro/${earlyRelease}/shiro-root-${earlyRelease}-source-release.zip.asc">pgp</a>, <a
- class="external-link"
- href="http://www.apache.org/dyn/closer.cgi/shiro/${earlyRelease}/shiro-root-${earlyRelease}-source-release.zip.sha512">sha512</a>)
-</p>
-
-<h3><a name="earlyGit"></a>${earlyRelease} Git Source repository</h3>
-
-<p>The source can be cloned anonymously from Git with this command:</p>
-<pre><code style="bash">git clone https://github.com/apache/shiro.git
-git checkout shiro-root-${earlyRelease} -b shiro-root-${earlyRelease}
-</code>
-</pre>
-
-
<h2><a name="previous"></a>Previous Releases</h2>
<h3><a name="1.4.xBinary"></a>${shiro14x.version} Binary Distribution</h3>
@@ -206,13 +163,13 @@
<p>The source bundle requires JDK 1.6 and Maven 3.0.3+ to build:</p>
-<p><a class="external-link" href="http://www.apache.org/dyn/closer.cgi/shiro/${shiro14x.version}/shiro-root-${shiro14x.version}-source-release.zip">zip</a>
+<p><a class="external-link" href="https://downloads.apache.org/shiro/${shiro14x.version}/shiro-root-${shiro14x.version}-source-release.zip">zip</a>
(<a class="external-link"
- href="http://www.apache.org/dyn/closer.cgi/shiro/${shiro14x.version}/shiro-root-${shiro14x.version}-source-release.zip.asc">pgp</a>, <a
+ href="https://downloads.apache.org/shiro/${shiro14x.version}/shiro-root-${shiro14x.version}-source-release.zip.asc">pgp</a>, <a
class="external-link"
- href="http://www.apache.org/dyn/closer.cgi/shiro/${shiro14x.version}/shiro-root-${shiro14x.version}-source-release.zip.md5">md5</a>, <a
+ href="https://downloads.apache.org/shiro/${shiro14x.version}/shiro-root-${shiro14x.version}-source-release.zip.md5">md5</a>, <a
class="external-link"
- href="http://www.apache.org/dyn/closer.cgi/shiro/${shiro14x.version}/shiro-root-${shiro14x.version}-source-release.zip.sha512">sha512</a>)
+ href="https://downloads.apache.org/shiro/${shiro14x.version}/shiro-root-${shiro14x.version}-source-release.zip.sha512">sha512</a>)
</p>
<h3><a name="1.4.xGit"></a>${shiro14x.version} Git Source repository</h3>
@@ -238,13 +195,13 @@
<p>The source bundle requires JDK 1.6 and Maven 3.0.3+ to build:</p>
-<p><a class="external-link" href="http://www.apache.org/dyn/closer.cgi/shiro/${shiro13x.version}/shiro-root-${shiro13x.version}-source-release.zip">zip</a>
+<p><a class="external-link" href="https://downloads.apache.org/shiro/${shiro13x.version}/shiro-root-${shiro13x.version}-source-release.zip">zip</a>
(<a class="external-link"
- href="http://www.apache.org/dyn/closer.cgi/shiro/${shiro13x.version}/shiro-root-${shiro13x.version}-source-release.zip.asc">pgp</a>, <a
+ href="https://downloads.apache.org/shiro/${shiro13x.version}/shiro-root-${shiro13x.version}-source-release.zip.asc">pgp</a>, <a
class="external-link"
- href="http://www.apache.org/dyn/closer.cgi/shiro/${shiro13x.version}/shiro-root-${shiro13x.version}-source-release.zip.md5">md5</a>, <a
+ href="https://downloads.apache.org/shiro/${shiro13x.version}/shiro-root-${shiro13x.version}-source-release.zip.md5">md5</a>, <a
class="external-link"
- href="http://www.apache.org/dyn/closer.cgi/shiro/${shiro13x.version}/shiro-root-${shiro13x.version}-source-release.zip.sha1">sha1</a>)
+ href="https://downloads.apache.org/shiro/${shiro13x.version}/shiro-root-${shiro13x.version}-source-release.zip.sha1">sha1</a>)
</p>
<h3><a name="1.3.xGit"></a>${shiro13x.version} Git Source repository</h3>
@@ -270,13 +227,13 @@
<p>The source bundle requires JDK 1.6 and Maven 3.0.3+ to build:</p>
-<p><a class="external-link" href="http://www.apache.org/dyn/closer.cgi/shiro/${shiro12x.version}/shiro-root-${shiro12x.version}-source-release.zip">zip</a>
+<p><a class="external-link" href="https://downloads.apache.org/shiro/${shiro12x.version}/shiro-root-${shiro12x.version}-source-release.zip">zip</a>
(<a class="external-link"
- href="http://www.apache.org/dyn/closer.cgi/shiro/${shiro12x.version}/shiro-root-${shiro12x.version}-source-release.zip.asc">pgp</a>, <a
+ href="https://downloads.apache.org/shiro/${shiro12x.version}/shiro-root-${shiro12x.version}-source-release.zip.asc">pgp</a>, <a
class="external-link"
- href="http://www.apache.org/dyn/closer.cgi/shiro/${shiro12x.version}/shiro-root-${shiro12x.version}-source-release.zip.md5">md5</a>, <a
+ href="https://downloads.apache.org/shiro/${shiro12x.version}/shiro-root-${shiro12x.version}-source-release.zip.md5">md5</a>, <a
class="external-link"
- href="http://www.apache.org/dyn/closer.cgi/shiro/${shiro12x.version}/shiro-root-${shiro12x.version}-source-release.zip.sha1">sha1</a>)
+ href="https://downloads.apache.org/shiro/${shiro12x.version}/shiro-root-${shiro12x.version}-source-release.zip.sha1">sha1</a>)
</p>
<h3><a name="1.2.xGit"></a>${shiro12x.version} Git Source repository</h3>
@@ -306,10 +263,10 @@
<p>The ${shiro11x.version} source bundle requires JDK 1.5+ and Maven 2.2+ to build:</p>
<p><a class="external-link"
- href="http://archive.apache.org/dist/shiro/${shiro11x.version}/shiro-root-${shiro11x.version}-source-release.zip">zip</a> (<a
- class="external-link" href="http://archive.apache.org/dist/shiro/${shiro11x.version}/shiro-root-${shiro11x.version}-source-release.zip.asc">pgp</a>,
- <a class="external-link" href="http://archive.apache.org/dist/shiro/${shiro11x.version}/shiro-root-${shiro11x.version}-source-release.zip.md5">md5</a>,
- <a class="external-link" href="http://archive.apache.org/dist/shiro/${shiro11x.version}/shiro-root-${shiro11x.version}-source-release.zip.sha1">sha1</a>)
+ href="https://archive.apache.org/dist/shiro/${shiro11x.version}/shiro-root-${shiro11x.version}-source-release.zip">zip</a> (<a
+ class="external-link" href="https://archive.apache.org/dist/shiro/${shiro11x.version}/shiro-root-${shiro11x.version}-source-release.zip.asc">pgp</a>,
+ <a class="external-link" href="https://archive.apache.org/dist/shiro/${shiro11x.version}/shiro-root-${shiro11x.version}-source-release.zip.md5">md5</a>,
+ <a class="external-link" href="https://archive.apache.org/dist/shiro/${shiro11x.version}/shiro-root-${shiro11x.version}-source-release.zip.sha1">sha1</a>)
</p>
<h4><a name="1.1.0Git"></a>${shiro11x.version} Git Source repository</h4>
diff --git a/index.html b/index.html
index a92ce6c..b4ec159 100644
--- a/index.html
+++ b/index.html
@@ -25,6 +25,10 @@
<div class="panel-body">
<div>
+ <a href="news.html">Release</a>
+ <p><small>1.5.3 available! (2020-5-3)</small></p>
+ </div>
+ <div>
<a href="news.html">Release and CVE</a>
<p><small>1.5.2 available with fix CVE-2020-1957 (2020-3-23)</small></p>
</div>
diff --git a/news.html b/news.html
index 58c1296..bf116c0 100644
--- a/news.html
+++ b/news.html
@@ -14,6 +14,38 @@
<div class="blog-post-listing">
<div class="logo-heading-block">
+ <a class="blogHeading" id="1.5.3-released" href="#1.5.3-released">Apache Shiro 1.5.3 Released</a>
+ </div>
+
+ <div class="news-content">
+ <p>The Shiro team is pleased to announce the release of Apache Shiro version 1.5.3. This is a feature release for 1.x.</p>
+
+ <p>This release includes 3 issues resolved since the 1.5.2 release and is available for Download now.</p>
+
+ <p>Of Note:
+ <ul>
+ <li>INI parser does not properly handled backslashes at end of values.</li>
+ <li>Regression in URI parsing in Shiro 1.5.2.</li>
+ <li>SimplePrincipalMap and SimplePrincipalCollection throw different exceptions for the same problem.</li>
+ <li>Dependency upgrade.</li>
+ </ul>
+
+ You can learn more on <a href="https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310950&version=12346916" target="_blank">Jira</a>
+ </p>
+
+ <p>Release binaries (.jars) are also available through Maven Central and source bundles through Apache distribution mirrors.</p>
+
+ <p>For more information on <a href="documentation.html">Shiro, please read the documentation.</a></p>
+
+ <p>Enjoy!</p>
+
+ <p>The Apache Shiro Team</p>
+ </div>
+</div>
+
+<div class="blog-post-listing">
+
+ <div class="logo-heading-block">
<a class="blogHeading" id="1.5.2-released" href="#1.5.2-released">Apache Shiro 1.5.2 Released</a>
</div>
diff --git a/robots.txt b/robots.txt
new file mode 100644
index 0000000..ef7a895
--- /dev/null
+++ b/robots.txt
@@ -0,0 +1 @@
+Sitemap: https://shiro.apache.org/sitemap.xml
diff --git a/site.xml b/sitemap.xml
similarity index 100%
rename from site.xml
rename to sitemap.xml
diff --git a/templates/default.vtl b/templates/default.vtl
index 0829a1a..e349169 100644
--- a/templates/default.vtl
+++ b/templates/default.vtl
@@ -24,6 +24,7 @@
<meta name="google-site-verification" content="ecFap6dWJgS_GCCtxmJQJ_nFYQhM6EgSpBPZDU7xsCE">
<meta name="msvalidate.01" content="0B57EB46CBFAD8FD45008D2DB6B6C68C">
<meta name="y_key" content="e47896cd6bae4920">
+ <link rel="sitemap" type="application/xml" title="Sitemap" href="/sitemap.xml">
<title>
#if ($title)
diff --git a/templates/versions.vtl b/templates/versions.vtl
index ada94a1..8ea2d0b 100644
--- a/templates/versions.vtl
+++ b/templates/versions.vtl
@@ -1,7 +1,5 @@
-#set( $latestRelease = "1.5.2" )
-#set( $versionInfo = {"1.5.2": { "releaseDate": "2020-03-32" } } )
-
-#set( $earlyRelease = "1.5.3-SNAPSHOT" )
+#set( $latestRelease = "1.5.3" )
+#set( $versionInfo = {"1.5.3": { "releaseDate": "2020-5-3" } } )
#set( $shiroCore = {"g":"org.apache.shiro", "a": "shiro-core", "type": "jar",
"description": 'Required in all environments. <a class="external-link" href="http://slf4j.org/">Slf4j</a>''s
@@ -138,23 +136,4 @@
$shiroHasher
]} )
-#set( $shiro15xSnapshot = {"version": $earlyRelease, "artifacts": [
- $shiroAll,
- $shiroCore,
- $shiroWeb,
- $shiroServletPlugin,
- $shiroJaxrs,
- $shiroAspectJ,
- $shiroCas,
- $shiroEhCache,
- $shiroHazelcast,
- $shiroFeatures,
- $shiroGuice,
- $shiroQuartz,
- $shiroSpring,
- $shiroSpringBoot,
- $shiroSpringBootWeb,
- $shiroHasher
-]} )
-
diff --git a/web.md.vtl b/web.md.vtl
index 279d817..7e0fab3 100644
--- a/web.md.vtl
+++ b/web.md.vtl
@@ -394,6 +394,7 @@
| anon | [org.apache.shiro.web.filter.authc.AnonymousFilter](static/current/apidocs/org/apache/shiro/web/filter/authc/AnonymousFilter.html) |
| authc | [org.apache.shiro.web.filter.authc.FormAuthenticationFilter](static/current/apidocs/org/apache/shiro/web/filter/authc/FormAuthenticationFilter.html) |
| authcBasic | [org.apache.shiro.web.filter.authc.BasicHttpAuthenticationFilter](static/current/apidocs/org/apache/shiro/web/filter/authc/BasicHttpAuthenticationFilter.html) |
+| authcBearer | [org.apache.shiro.web.filter.authc.BearerHttpAuthenticationFilter](static/current/apidocs/org/apache/shiro/web/filter/authc/BearerHttpAuthenticationFilter.html) |
| logout | [org.apache.shiro.web.filter.authc.LogoutFilter](static/current/apidocs/org/apache/shiro/web/filter/authc/LogoutFilter.html) |
| noSessionCreation | [org.apache.shiro.web.filter.session.NoSessionCreationFilter](static/current/apidocs/org/apache/shiro/web/filter/session/NoSessionCreationFilter.html) |
| perms | [org.apache.shiro.web.filter.authz.PermissionsAuthorizationFilter](static/current/apidocs/org/apache/shiro/web/filter/authz/PermissionsAuthorizationFilter.html) |
