pre-commit: add 3 more hooks; fix end of files

.pre-commit-config.yaml

@@ -43,9 +43,12 @@ repos:
       - id: check-shebang-scripts-are-executable
       - id: check-vcs-permalinks
       - id: check-xml
+      - id: check-yaml
+      - id: destroyed-symlinks
       - id: detect-aws-credentials
         args: [--allow-missing-credentials]
       - id: detect-private-key
+      - id: end-of-file-fixer
       - id: forbid-submodules
   - repo: https://github.com/igorshubovych/markdownlint-cli
     rev: v0.45.0

LICENSE

@@ -198,4 +198,4 @@
    distributed under the License is distributed on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
-   limitations under the License.
+   limitations under the License.

config/ogdl/src/test/groovy/org/apache/shiro/config/ogdl/SimpleEnum.groovy

@@ -21,4 +21,4 @@ package org.apache.shiro.config.ogdl
 enum SimpleEnum {
     FOO,
     BAR
-}
+}

config/pom.xml

@@ -37,4 +37,3 @@
     </modules>
 
 </project>
-

core/src/main/java/org/apache/shiro/aop/MethodInvocation.java

@@ -61,4 +61,3 @@ public interface MethodInvocation {
 
 
 }
-

core/src/main/java/org/apache/shiro/util/ThreadContext.java

@@ -328,4 +328,3 @@ public static Subject unbindSubject() {
         return (Subject) remove(SUBJECT_KEY);
     }
 }
-

core/src/test/java/org/apache/shiro/aop/AnnotationResolverTest.java

@@ -75,4 +75,3 @@ void testNullMethodInvocation() throws SecurityException, NoSuchMethodException
         assertNull(annotationResolver.getAnnotation(methodInvocation, RequiresUser.class));
     }
 }
-

core/src/test/resources/org/apache/shiro/config/IniSecurityManagerFactoryTest.ini

@@ -21,4 +21,4 @@
 user1 = user1, admin
 
 [roles]
-admin = *
+admin = *

core/src/test/resources/org/apache/shiro/realm/text/IniRealmTest.simple.ini

@@ -22,4 +22,3 @@ user1 = user1, admin
 
 [roles]
 admin = *
-

core/src/test/resources/test.shiro.ini

@@ -18,4 +18,4 @@
 #
 
 [users]
-jsmith = jsmith,role1
+jsmith = jsmith,role1

crypto/hash/src/main/java/org/apache/shiro/crypto/hash/Sha512Hash.java

@@ -67,4 +67,3 @@ public static Sha512Hash fromBase64String(String base64) {
         return hash;
     }
 }
-

crypto/hash/src/test/groovy/org/apache/shiro/crypto/hash/format/HexFormatTest.groovy

@@ -47,5 +47,3 @@ class HexFormatTest {
     }
 
 }
-
-

crypto/pom.xml

@@ -39,4 +39,3 @@
     </modules>
 
 </project>
-

integration-tests/guice3/src/main/webapp/WEB-INF/shiro.ini

@@ -50,4 +50,4 @@ goodguy = winnebago:drive:eagle5
 /login.jsp = authc
 /logout = logout
 /account/** = authc
-/remoting/** = authc, roles[b2bClient], perms["remote:invoke:lan,wan"]
+/remoting/** = authc, roles[b2bClient], perms["remote:invoke:lan,wan"]

integration-tests/guice3/src/main/webapp/account/index.jsp

@@ -33,4 +33,4 @@
 <p><a href="<c:url value="/logout"/>">Log out.</a></p>
 
 </body>
-</html>
+</html>

integration-tests/guice3/src/main/webapp/include.jsp

@@ -19,4 +19,4 @@
 <%@ page import="org.apache.shiro.SecurityUtils" %>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
-<%@ taglib prefix="shiro" uri="http://shiro.apache.org/tags" %>
+<%@ taglib prefix="shiro" uri="http://shiro.apache.org/tags" %>

integration-tests/guice3/src/main/webapp/index.jsp

@@ -18,4 +18,4 @@
   --%>
 
 <%-- Forward the user to the home page --%>
-<jsp:forward page="home.jsp"/>
+<jsp:forward page="home.jsp"/>

integration-tests/guice3/src/main/webapp/style.css

@@ -44,4 +44,4 @@ img {
     color: black;
     background: #eee;
     border: thick black solid;
-}
+}

integration-tests/guice4/src/main/webapp/WEB-INF/shiro.ini

@@ -50,4 +50,4 @@ goodguy = winnebago:drive:eagle5
 /login.jsp = authc
 /logout = logout
 /account/** = authc
-/remoting/** = authc, roles[b2bClient], perms["remote:invoke:lan,wan"]
+/remoting/** = authc, roles[b2bClient], perms["remote:invoke:lan,wan"]

integration-tests/guice4/src/main/webapp/account/index.jsp

@@ -33,4 +33,4 @@
 <p><a href="<c:url value="/logout"/>">Log out.</a></p>
 
 </body>
-</html>
+</html>

integration-tests/guice4/src/main/webapp/include.jsp

@@ -19,4 +19,4 @@
 <%@ page import="org.apache.shiro.SecurityUtils" %>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
-<%@ taglib prefix="shiro" uri="http://shiro.apache.org/tags" %>
+<%@ taglib prefix="shiro" uri="http://shiro.apache.org/tags" %>

integration-tests/guice4/src/main/webapp/index.jsp

@@ -18,4 +18,4 @@
   --%>
 
 <%-- Forward the user to the home page --%>
-<jsp:forward page="home.jsp"/>
+<jsp:forward page="home.jsp"/>

integration-tests/guice4/src/main/webapp/style.css

@@ -44,4 +44,4 @@ img {
     color: black;
     background: #eee;
     border: thick black solid;
-}
+}

integration-tests/jakarta-ee/src/main/webapp/shiro/auth/unauthenticated.xhtml

@@ -26,4 +26,3 @@
         User Not Authenticated
     </h:body>
 </html>
-

integration-tests/jaxrs/tests/src/main/java/org/apache/shiro/testing/jaxrs/tests/AbstractShiroJaxRsIT.java

@@ -78,4 +78,3 @@ public void testGetUsersBasicAuthenticated() {
     }
 
 }
-

samples/guice/src/main/webapp/WEB-INF/shiro.ini

@@ -50,4 +50,4 @@ goodguy = winnebago:drive:eagle5
 /login.jsp = authc
 /logout = logout
 /account/** = authc
-/remoting/** = authc, roles[b2bClient], perms["remote:invoke:lan,wan"]
+/remoting/** = authc, roles[b2bClient], perms["remote:invoke:lan,wan"]

samples/guice/src/main/webapp/account/index.jsp

@@ -33,4 +33,4 @@
 <p><a href="<c:url value="/logout"/>">Log out.</a></p>
 
 </body>
-</html>
+</html>

samples/guice/src/main/webapp/include.jsp

@@ -19,4 +19,4 @@
 <%@ page import="org.apache.shiro.SecurityUtils" %>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
-<%@ taglib prefix="shiro" uri="http://shiro.apache.org/tags" %>
+<%@ taglib prefix="shiro" uri="http://shiro.apache.org/tags" %>

samples/guice/src/main/webapp/index.jsp

@@ -18,4 +18,4 @@
   --%>
 
 <%-- Forward the user to the home page --%>
-<jsp:forward page="home.jsp"/>
+<jsp:forward page="home.jsp"/>

samples/guice/src/main/webapp/style.css

@@ -44,4 +44,4 @@ img {
     color: black;
     background: #eee;
     border: thick black solid;
-}
+}

samples/servlet-plugin/src/main/webapp/WEB-INF/shiro.ini

@@ -54,4 +54,4 @@ goodguy = winnebago:drive:eagle5
 /login.jsp = authc
 /logout = logout
 /account/** = authc
-/remoting/** = authc, roles[b2bClient], perms["remote:invoke:lan,wan"]
+/remoting/** = authc, roles[b2bClient], perms["remote:invoke:lan,wan"]

samples/servlet-plugin/src/main/webapp/account/index.jsp

@@ -33,4 +33,4 @@
 <p><a href="<c:url value="/logout"/>">Log out.</a></p>
 
 </body>
-</html>
+</html>

samples/servlet-plugin/src/main/webapp/include.jsp

@@ -19,4 +19,4 @@
 <%@ page import="org.apache.shiro.SecurityUtils" %>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
-<%@ taglib prefix="shiro" uri="http://shiro.apache.org/tags" %>
+<%@ taglib prefix="shiro" uri="http://shiro.apache.org/tags" %>

samples/servlet-plugin/src/main/webapp/index.jsp

@@ -18,4 +18,4 @@
   --%>
 
 <%-- Forward the user to the home page --%>
-<jsp:forward page="home.jsp"/>
+<jsp:forward page="home.jsp"/>

samples/servlet-plugin/src/main/webapp/style.css

@@ -44,4 +44,4 @@ img {
     color: black;
     background: #eee;
     border: thick black solid;
-}
+}

samples/spring-boot-3-web/src/main/resources/application.properties

@@ -23,4 +23,4 @@ shiro.loginUrl = /login.html
 shiro.userNativeSessionManager = true
 
 # disable URL session rewriting
-shiro.sessionManager.sessionIdUrlRewritingEnabled = false
+shiro.sessionManager.sessionIdUrlRewritingEnabled = false

samples/spring-boot-3-web/src/main/resources/templates/account-info.html

@@ -36,4 +36,4 @@ <h1 th:text="'Account Info Page for: ' + ${name} + '!'"/>
 <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
 <script src="https://netdna.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"></script>
 </body>
-</html>
+</html>

samples/spring-boot-3-web/src/main/resources/templates/error.html

@@ -36,4 +36,4 @@ <h1 th:text="${errors.status}"></h1>
     </div>
 </div>
 </body>
-</html>
+</html>

samples/spring-boot-3-web/src/main/resources/templates/fragments/head.html

@@ -55,4 +55,4 @@
 <body>
 <p>Nothing to see here, move along.</p>
 </body>
-</html>
+</html>

samples/spring-boot-3-web/src/main/resources/templates/hello.html

@@ -42,4 +42,4 @@ <h4><a th:href="@{/account-info}" class="btn btn-primary">Account info</a>&nbsp;
 <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
 <script src="https://netdna.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"></script>
 </body>
-</html>
+</html>

samples/spring-boot-3-web/src/main/resources/templates/login.html

@@ -90,4 +90,4 @@ <h3 class="panel-title">Login</h3>
 <script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
 <![endif]-->
 </body>
-</html>
+</html>

samples/spring-boot-web/src/main/resources/application.properties

@@ -23,4 +23,4 @@ shiro.loginUrl = /login.html
 shiro.userNativeSessionManager = true
 
 # disable URL session rewriting
-shiro.sessionManager.sessionIdUrlRewritingEnabled = false
+shiro.sessionManager.sessionIdUrlRewritingEnabled = false

samples/spring-boot-web/src/main/resources/templates/account-info.html

@@ -36,4 +36,4 @@ <h1 th:text="'Account Info Page for: ' + ${name} + '!'"/>
 <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
 <script src="https://netdna.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"></script>
 </body>
-</html>
+</html>

samples/spring-boot-web/src/main/resources/templates/error.html

@@ -36,4 +36,4 @@ <h1 th:text="${errors.status}"></h1>
     </div>
 </div>
 </body>
-</html>
+</html>

samples/spring-boot-web/src/main/resources/templates/fragments/head.html

@@ -55,4 +55,4 @@
 <body>
 <p>Nothing to see here, move along.</p>
 </body>
-</html>
+</html>

samples/spring-boot-web/src/main/resources/templates/hello.html

@@ -42,4 +42,4 @@ <h4><a th:href="@{/account-info}" class="btn btn-primary">Account info</a>&nbsp;
 <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
 <script src="https://netdna.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"></script>
 </body>
-</html>
+</html>

samples/spring-boot-web/src/main/resources/templates/login.html

@@ -90,4 +90,4 @@ <h3 class="panel-title">Login</h3>
 <script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
 <![endif]-->
 </body>
-</html>
+</html>

samples/spring-boot/src/main/resources/application.properties

@@ -18,4 +18,4 @@
 #
 
 logging.level.org.springframework.web=INFO
-logging.level.org.hibernate=ERROR
+logging.level.org.hibernate=ERROR

samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/dao/HibernateUserDAO.java

@@ -58,4 +58,3 @@ public void updateUser(User user) {
     }
 
 }
-

samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/model/Role.java

@@ -100,5 +100,3 @@ public void setPermissions(Set<String> permissions) {
     }
 
 }
-
-

samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/model/User.java

@@ -118,5 +118,3 @@ public void setRoles(Set<Role> roles) {
     }
 
 }
-
-

samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/security/SampleRealm.java

@@ -88,4 +88,3 @@ protected AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principal
     }
 
 }
-

samples/spring-hibernate/src/main/resources/ehcache.xml

@@ -53,4 +53,4 @@
            timeToLiveSeconds="3600"
            overflowToDisk="true"/>
 
-</ehcache>
+</ehcache>

samples/spring-hibernate/src/main/resources/hibernate.cfg.xml

@@ -32,4 +32,4 @@
         <mapping class="org.apache.shiro.samples.sprhib.model.User"/>
 
     </session-factory>
-</hibernate-configuration>
+</hibernate-configuration>

samples/spring-hibernate/src/main/webapp/index.jsp

@@ -19,4 +19,4 @@
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 
 <%-- Redirect to index page --%>
-<c:redirect url="/s/home"/>
+<c:redirect url="/s/home"/>

samples/spring-hibernate/src/main/webapp/styles/sample.css

@@ -109,4 +109,4 @@ a:hover {
 
 .clearfix {
     display: block;
-}
+}

samples/spring-mvc/src/main/webapp/WEB-INF/resources/include.jsp

@@ -21,4 +21,4 @@
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
-<%@ taglib prefix="shiro" uri="http://shiro.apache.org/tags" %>
+<%@ taglib prefix="shiro" uri="http://shiro.apache.org/tags" %>

samples/spring-mvc/src/main/webapp/WEB-INF/resources/sampleIndex.jsp

@@ -72,4 +72,4 @@
     </p>
 </div>
 </body>
-</html>
+</html>

samples/spring-mvc/src/main/webapp/shiro.css

@@ -45,4 +45,4 @@ img {
     color: black;
     background: #eee;
     border: thick #ccc solid;
-}
+}

samples/spring/src/main/resources/application.properties

@@ -16,4 +16,3 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-