This is an automated email from the ASF dual-hosted git repository.
lprimak pushed a change to branch 3.x
in repository https://gitbox.apache.org/repos/asf/shiro.git
from 809b74bb4 Merge pull request #2358 from lprimak/consolidate-junit
add 5aa33c6ba chore(deps): bump org.owasp:dependency-check-maven from
12.1.6 to 12.1.8
add 9122974d4 Merge pull request #2302 from
apache/dependabot/maven/org.owasp-dependency-check-maven-12.1.8
add 0ba85942f chore(deps): bump github/codeql-action from 4.30.8 to 4.30.9
add 6f08c241e Merge pull request #2311 from
apache/dependabot/github_actions/github/codeql-action-4.30.9
add d3fd25118 [release] Prepare for next iteration
add d5db74331 Fix typos in Java code comments
add 4102f1f33 Merge pull request #2312 from jbampton/fix-typos
add 718e2ff2f chore(deps): bump org.codehaus.mojo:exec-maven-plugin
add 86637ddac Merge pull request #2316 from
apache/dependabot/maven/org.codehaus.mojo-exec-maven-plugin-3.6.2
add cf93fcae6 Fix grammar/typo in `CONTRIBUTING.md`
add 955e2ac19 Merge pull request #2315 from jbampton/grammar-fix
add 7251d1773 Use https on links
add 4fd649116 Merge pull request #2314 from jbampton/use-https-on-links
add e78baa4a4 chore(deps): bump org.codehaus.mojo:xml-maven-plugin from
1.1.0 to 1.2.0
add 3d7b10ca5 Merge pull request #2321 from
apache/dependabot/maven/org.codehaus.mojo-xml-maven-plugin-1.2.0
add 4b348b18e Added support for iterations parameter
add 3927b9ed3 Merge pull request #2324 from
ntolppi/feature-iterations-parameter
add b8c943212 chore: bump java version 24 -> 25
add 52aa76d20 bugfix: logic for iteration parameter in the hasher
add bc863e74e Merge pull request #2326 from lprimak/hasher-fix
add 864f0461f Adds setPrincipalSuffix() to AbstractLdapRealm & updates
ActiveDirectoryRealm
add 21e8c2d14 Merge pull request #2310 from tbrugz/issue-2308
add 9a9456624 Add basic pull request labeler workflow
add 7b0a61ae0 Merge pull request #2322 from jbampton/add-pr-labeler
add 3c0a0f198 Add `codespell` with `pre-commit` and fix typos
add 00b397d3b Add rat exclude
add e8d3ce181 Merge pull request #2313 from
jbampton/add-codespell-with-pre-commit
add c13164e6a pre-commit: add `yamllint` and standardize YAML files
add eba48ab42 [#2308] activedirectory: added Initialization test
add feee90355 Merge pull request #2329 from tbrugz/issue-2308
add 02645a9d0 Optimize Dependabot by using `groups` for `github-actions`
ecosystem
add 885fc6bfa Merge pull request #2340 from jbampton/optimize-dependabot
add 02cf4321a pre-commit: add `gitleaks` to check for secrets
add 72fd0dfbe Merge pull request #2336 from jbampton/add-gitleaks
add f77102758 chore(deps): bump the github-dependencies group with 2
updates
add 3fb8489a4 Merge pull request #2347 from
apache/dependabot/github_actions/github-dependencies-522a0045d5
add 4abbb5f92 chore(deps): bump org.quartz-scheduler:quartz from 2.5.0 to
2.5.1
add ab71206d8 Merge pull request #2350 from
apache/dependabot/maven/org.quartz-scheduler-quartz-2.5.1
add 7e470df32 Fix spelling in `pom.xml`
add 248336159 Merge pull request #2331 from jbampton/fix-typos
add 14c5f6f53 Add basic EditorConfig file
add f94ec83c1 Add license header
add 28d28898b Merge pull request #2335 from jbampton/add-editorconfig
add 367ddec68 Pull request labeler: add more labels
add 377842f23 Label groovy and java test directories
add f348791e6 Merge pull request #2334 from jbampton/more-labels
add 35c483d3d Merge branch 'main' into add-yamllint
add 0bf6c8e7e Merge pull request #2343 from jbampton/add-yamllint
add 7569fefaa Add CodeQL for `actions`
add b172ac6f0 Merge pull request #2333 from jbampton/codeql-for-actions
add 258336c14 bugfix: renamed bcrypt algo name so it's usable, refactored
algo name handling, changed default non-password hashing algo to SHA-256 as per
the help text
add 9d0ed7868 fix(hasher): updated help text to reflect reality
add e456655ab Merge pull request #2327 from lprimak/rename-bcrypt-algo-name
add de3c6f127 Add 6 official pre-commit hooks
add 15accfe06 Merge pull request #2330 from jbampton/more-pre-commit
add eaca5eb46 pre-commit: add oxipng for lossless PNG compression
add 7dcffd651 Merge pull request #2337 from jbampton/add-oxipng
add 242bb77d5 Add 5 more official pre-commit hooks
add 211abf3bb Merge pull request #2351 from
jbampton/add-more-official-hooks
add 2fc9027bd pre-commit: add `markdownlint` and clean Markdown files
add 80962857d Merge pull request #2338 from jbampton/add-markdownlint
add ddf89bd40 pre-commit: add `actionlint` for GitHub Actions workflow
files
add 7c87506b7 Merge pull request #2342 from jbampton/add-actionlint
add 0f8995f0c pre-commit: add `shellcheck` and clean shell files
add bbc3c4a6a Merge pull request #2339 from
jbampton/pre-commit-add-shellcheck
add eee14b9fa [maven-release-plugin] prepare release shiro-root-2.0.6
add 91d8a0367 [maven-release-plugin] prepare for next development iteration
add 117069332 [integeration-tests] Fix groovy script indentation for
jakarta-ee
add 0a51438da [integeration-tests] Move groovy script in dedicated file
for jakarata-ee
add a298c85b4 chore: rename script.groovy -> setPayaraPort.groovy
add eabb786fa chore(deps): bump org.htmlunit:htmlunit from 4.17.0 to 4.18.0
add db75be10f Merge pull request #2355 from
apache/dependabot/maven/org.htmlunit-htmlunit-4.18.0
add 4586eb6a0 chore: hide deprecation warning in AD test
add 8eb5812b9 Merge pull request #2352 from
lprimak/fix-test-deprecation-warning
add 161b335af chore(deps): bump github/codeql-action in the
github-dependencies group
add de06e6abd Merge pull request #2353 from
apache/dependabot/github_actions/github-dependencies-02cf758a13
add 3d8775b06 chore(deps): bump bytebuddy.version from 1.17.8 to 1.18.1
add d4dd6366c Merge pull request #2369 from
apache/dependabot/maven/bytebuddy.version-1.18.1
add 1b3f2cd96 chore(deps): bump org.owasp:dependency-check-maven from
12.1.8 to 12.1.9
add d8869d1a4 Merge pull request #2367 from
apache/dependabot/maven/org.owasp-dependency-check-maven-12.1.9
add b07faf17c chore(deps): bump org.omnifaces:omnifaces from 3.14.11 to
3.14.12
add 5bd0051da Merge pull request #2364 from
apache/dependabot/maven/org.omnifaces-omnifaces-3.14.12
add fb79c84a7 chore: update frequency for dependabot scanning to weekly
for 2.x and monthly for 1.x
add d91c6a522 chore(dependabot): fix spelling
add 2167c2fe7 chore: update dependency in RAT plugin to remove warnings on
JDK 25
add 18dc69fad chore: update maven wrapper to 3.3.4
add 3d08fe197 chore(maven-4): maven.properties -> maven-user.properties
add 3af59b5f5 allow cors preflight requests to bypass authentication (#953)
add 8cbc6645d Merge pull request #2372 from
celikfatih/feature-preflight-support
add b6613732e Pin all actions workflows
add 973e7093d chore: put back changes that were overwritten by maven
release plugin
add c7fdd664e Merge pull request #2375 from lprimak/whitespace-pom-header
add 744fa24e1 chore(deps): bump bytebuddy.version from 1.18.1 to 1.18.2
add 10cd8cfb4 Merge pull request #2389 from
apache/dependabot/maven/bytebuddy.version-1.18.2
add d6c7ca63a chore(deps): bump org.quartz-scheduler:quartz from 2.5.1 to
2.5.2
add 8e0150202 Merge pull request #2387 from
apache/dependabot/maven/org.quartz-scheduler-quartz-2.5.2
add ada110e93 chore(deps): bump org.codehaus.mojo:taglist-maven-plugin
add b38c65737 Merge pull request #2380 from
apache/dependabot/maven/org.codehaus.mojo-taglist-maven-plugin-3.2.2
add b041eb6db chore(deps): bump org.codehaus.mojo:versions-maven-plugin
add 083abeb80 Merge pull request #2379 from
apache/dependabot/maven/org.codehaus.mojo-versions-maven-plugin-2.20.1
add 50ce20242 chore(deps): bump org.htmlunit:htmlunit from 4.18.0 to 4.19.0
add d872d4360 Merge pull request #2377 from
apache/dependabot/maven/org.htmlunit-htmlunit-4.19.0
add 977436e38 chore(deps): bump org.owasp.encoder:encoder from 1.3.1 to
1.4.0
add 5ac8d9ef7 Merge pull request #2374 from
apache/dependabot/maven/org.owasp.encoder-encoder-1.4.0
add e4f66bd1d chore(deps): bump the github-dependencies group with 2
updates
add 7d77aa3ac Merge pull request #2373 from
apache/dependabot/github_actions/github-dependencies-718fbf2243
add 95b8b13c3 Configure EditorConfig for `.rdf`
add 41eebb71e Merge pull request #2386 from jbampton/editorconfig-rdf
add fb5591dd2 Remove `type` attributes from HTML `script` tags
add 9add4e61a Merge pull request #2382 from
jbampton/clean-up-html-script-tags
add 31918c6da pre-commit: add 3 more hooks; fix end of files
add 347b2f44f Merge pull request #2360 from jbampton/add-more-hooks
add 0787634d9 Merge branch 'main' into pin-gha-workflows
add 9511d064c Merge pull request #2385 from jbampton/pin-gha-workflows
add 8929736a5 Add pre-commit hook to trim trailing whitespace
add bd5630421 Merge pull request #2406 from jbampton/add-more-hooks
add ad72860d3 gha: use pre-commit run `--color=always`
add beb3cccb0 Merge pull request #2407 from
jbampton/pre-commit-color-always
add 78f783d4d chore: pin python and it's depenendencies for pre-commit
check on GitHub
add e5362ae4c Merge pull request #2408 from lprimak/pin-precommit-deps
add 60ee3864e chore: pin python pre-commit workflow dependency with hash
add d6e43790a Merge pull request #2410 from lprimak/pin-python-hashes
add b96569508 chore: fix vulnerabilities in tests reported by OpenSSF tool
add ea1556bfc Add descriptions to all pre-commit hooks
add 379fd8a00 Merge pull request #2409 from jbampton/pre-commit-clean-up
add cdf0f658a Merge remote-tracking branch 'upstream/main'
add 88cfebf49 enh(github): Enable GitHub Discuseions and Squash-and-Merge
buttons fixes #2036 fixes #2381
add 716f038e8 chore: fixed discussions notification target in .asf.yaml
and syncd pull request template since "squash and merge" is enabled
add d3750f67a Revert "chore: fix vulnerabilities in tests reported by
OpenSSF tool"
add 6e2d10921 chore: fix vulnerabilities in tests reported by OpenSSF tool
(#2411)
add 33abdb057 chore: added top-level permissions to labeleer
add 14c88cea9 Revert "chore: added top-level permissions to labeleer"
add a5e50b6f7 chore(deps): bump org.htmlunit:htmlunit from 4.19.0 to 4.20.0
add cb7508bfd Merge pull request #2415 from
apache/dependabot/maven/org.htmlunit-htmlunit-4.20.0
add 5ec465893 chore(deps): bump the github-dependencies group with 5
updates
add 3f89f28a8 Merge pull request #2414 from
apache/dependabot/github_actions/github-dependencies-9755b130f1
add 864c76447 chore(deps): bump mockito.version from 5.20.0 to 5.21.0
add a2fc40738 Merge pull request #2420 from
apache/dependabot/maven/mockito.version-5.21.0
add d971707b5 chore(deps): bump ch.qos.logback:logback-core from 1.5.21 to
1.5.22
add df703a154 Merge pull request #2419 from
apache/dependabot/maven/ch.qos.logback-logback-core-1.5.22
add f564f3d19 chore(deps): bump ch.qos.logback:logback-classic from 1.5.21
to 1.5.22
add c25036eb8 Merge pull request #2417 from
apache/dependabot/maven/ch.qos.logback-logback-classic-1.5.22
add e6c136723 chore(deps): bump the github-dependencies group with 3
updates
add c1f864c73 Merge pull request #2418 from
apache/dependabot/github_actions/github-dependencies-bb8a6fe874
add 0b0b29c00 chore(security): update log4-core
add a4b01e302 Merge pull request #2430 from lprimak/update-log4j-core
add ade9edf80 chore(deps): bump org.codehaus.mojo:exec-maven-plugin
add a723494a6 Merge pull request #2429 from
apache/dependabot/maven/org.codehaus.mojo-exec-maven-plugin-3.6.3
add 1946f2800 chore(deps): bump ch.qos.logback:logback-core from 1.5.22 to
1.5.23
add 078dfbd5a Merge pull request #2427 from
apache/dependabot/maven/ch.qos.logback-logback-core-1.5.23
add 93767d428 chore(deps): bump
com.github.siom79.japicmp:japicmp-maven-plugin
add 594ae9a0c Merge pull request #2428 from
apache/dependabot/maven/com.github.siom79.japicmp-japicmp-maven-plugin-0.25.1
add 7d2c230c0 chore(deps): bump github/codeql-action in the
github-dependencies group
add 1d2dbb3f0 Merge pull request #2424 from
apache/dependabot/github_actions/github-dependencies-34cf0c888b
add e5bae1cc7 chore(deps): bump ch.qos.logback:logback-classic from 1.5.22
to 1.5.23
add b461aa7f5 Merge pull request #2426 from
apache/dependabot/maven/ch.qos.logback-logback-classic-1.5.23
add 1a53053c3 chore(deps): bump bytebuddy.version from 1.18.2 to 1.18.3
(#2425)
add 8ae4e967b chore(deps): bump org.htmlunit:htmlunit from 4.20.0 to 4.21.0
add 2b494c560 Merge pull request #2431 from
apache/dependabot/maven/org.htmlunit-htmlunit-4.21.0
add a0f038fc8 chore: removed slf4j-api from javadoc dependencies as it
causes too many build failures
add ff6284380 chore(deps): bump ch.qos.logback:logback-classic from 1.5.23
to 1.5.24
add 81e0936d1 Merge pull request #2455 from
apache/dependabot/maven/ch.qos.logback-logback-classic-1.5.24
add f135dca7e chore(deps): bump org.owasp:dependency-check-maven from
12.1.9 to 12.2.0
add eb041f248 Merge pull request #2454 from
apache/dependabot/maven/org.owasp-dependency-check-maven-12.2.0
add d6d5fca67 chore(deps): bump
com.github.siom79.japicmp:japicmp-maven-plugin
add df1134245 Merge pull request #2453 from
apache/dependabot/maven/com.github.siom79.japicmp-japicmp-maven-plugin-0.25.4
add 0899bfb7e chore(deps): bump ch.qos.logback:logback-core from 1.5.23 to
1.5.24
add f0b5275e6 Merge pull request #2452 from
apache/dependabot/maven/ch.qos.logback-logback-core-1.5.24
add 88882184c chore(deps): bump javax.enterprise:cdi-api from 2.0 to
2.0.SP1
add 257eaa739 Merge pull request #2451 from
apache/dependabot/maven/javax.enterprise-cdi-api-2.0.SP1
add 6a5ad1537 chore(deps): bump org.jsoup:jsoup from 1.21.2 to 1.22.1
add 17b950463 Merge pull request #2442 from
apache/dependabot/maven/org.jsoup-jsoup-1.22.1
add 88dfa4356 chore(deps): bump github/codeql-action in the
github-dependencies group
add 81e453664 Merge pull request #2449 from
apache/dependabot/github_actions/github-dependencies-e42aeb3dac
add 3ae737441 bugfix: avoid duplicate proxying of
StoppingAwareProxiedSession
add fb9b036b7 Merge pull request #2459 from
lprimak/fix-duplicate-stopping-session
add 471f16756 [#2458] Deploy next snapshot version as computed dynamically
from latest release (#2456)
add fb2af26cf Streamline authentication handling and credential matching
new ebd1d1e3b Merge branch 'main' into 3.x
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.asf.yaml | 10 +-
.../maven-wrapper.properties => .editorconfig | 18 +++-
.github/ISSUE_TEMPLATE/bug_report.yml | 2 +-
.github/ISSUE_TEMPLATE/documentation_related.yml | 2 +-
.github/ISSUE_TEMPLATE/enhancement_request.yml | 2 +-
.github/ISSUE_TEMPLATE/feature_request.yml | 2 +-
.github/ISSUE_TEMPLATE/question.yml | 2 +-
.github/dependabot.yml | 16 ++-
.../labeler.yml | 23 +++-
.../linters/.markdown-lint.yml | 21 +++-
.../linters/.yaml-lint.yml | 15 ++-
.github/linters/codespell.txt | 16 +++
.github/pull_request_template.md | 5 +-
.github/workflows/codeql.yml | 10 +-
.../workflows/dependency-review.yml | 18 +++-
.../workflows/labeler.yml | 21 +++-
.github/workflows/maven.yml | 16 +--
.github/workflows/pre-commit.yml | 60 +++++++++++
.github/workflows/scorecards.yml | 8 +-
.github/workflows/stale.yml | 2 +-
.jenkins.groovy | 32 +++++-
.mvn/{maven.properties => maven-user.properties} | 0
.mvn/wrapper/maven-wrapper.properties | 20 +---
.pre-commit-config.yaml | 114 ++++++++++++++++++++
CONTRIBUTING.md | 8 +-
LICENSE | 2 +-
README.md | 13 ++-
RELEASE-NOTES | 4 +-
bom/pom.xml | 2 +-
cache/pom.xml | 2 +-
config/core/pom.xml | 2 +-
config/ogdl/pom.xml | 2 +-
.../org/apache/shiro/config/ogdl/SimpleEnum.groovy | 2 +-
config/pom.xml | 3 +-
core/pom.xml | 2 +-
.../org/apache/shiro/aop/MethodInvocation.java | 1 -
.../credential/AllowAllCredentialsMatcher.java | 7 ++
.../shiro/authc/credential/CredentialsMatcher.java | 12 +++
.../shiro/authc/credential/PasswordMatcher.java | 7 +-
.../authc/credential/SimpleCredentialsMatcher.java | 34 ++++++
.../shiro/mgt/AbstractRememberMeManager.java | 2 +-
.../apache/shiro/realm/AuthenticatingRealm.java | 84 ++++++++++++---
.../activedirectory/ActiveDirectoryRealm.java | 17 +--
.../apache/shiro/realm/ldap/AbstractLdapRealm.java | 9 ++
.../org/apache/shiro/session/package-info.java | 2 +-
.../shiro/subject/support/DelegatingSubject.java | 2 +-
.../java/org/apache/shiro/util/ThreadContext.java | 1 -
.../shiro/realm/AuthenticatingRealmTest.groovy | 1 +
.../apache/shiro/aop/AnnotationResolverTest.java | 1 -
.../shiro/realm/AuthenticatingRealmJavaTest.java | 120 +++++++++++++++++++++
.../activedirectory/ActiveDirectoryRealmTest.java | 28 ++++-
.../shiro/config/IniSecurityManagerFactoryTest.ini | 2 +-
.../AdRealm.withPrincipalSuffix.ini | 14 ++-
.../shiro/realm/text/IniRealmTest.simple.ini | 1 -
core/src/test/resources/test.shiro.ini | 2 +-
crypto/cipher/pom.xml | 2 +-
crypto/core/pom.xml | 2 +-
crypto/hash/pom.xml | 2 +-
.../org/apache/shiro/crypto/hash/HashService.java | 2 +-
.../org/apache/shiro/crypto/hash/Sha512Hash.java | 1 -
.../shiro/crypto/hash/SimpleHashProvider.java | 2 +-
.../shiro/crypto/hash/format/HexFormatTest.groovy | 2 -
crypto/pom.xml | 3 +-
crypto/support/hashes/argon2/pom.xml | 2 +-
.../crypto/support/hashes/argon2/Argon2Hash.java | 5 +-
crypto/support/hashes/bcrypt/pom.xml | 2 +-
.../crypto/support/hashes/bcrypt/BCryptHash.java | 39 +++++--
crypto/support/pom.xml | 2 +-
event/pom.xml | 2 +-
integration-tests/guice3/pom.xml | 2 +-
.../guice3/src/main/webapp/WEB-INF/shiro.ini | 6 +-
.../guice3/src/main/webapp/account/index.jsp | 2 +-
.../guice3/src/main/webapp/include.jsp | 2 +-
integration-tests/guice3/src/main/webapp/index.jsp | 2 +-
integration-tests/guice3/src/main/webapp/style.css | 2 +-
integration-tests/guice4/pom.xml | 2 +-
.../guice4/src/main/webapp/WEB-INF/shiro.ini | 6 +-
.../guice4/src/main/webapp/account/index.jsp | 2 +-
.../guice4/src/main/webapp/include.jsp | 2 +-
integration-tests/guice4/src/main/webapp/index.jsp | 2 +-
integration-tests/guice4/src/main/webapp/style.css | 2 +-
integration-tests/jakarta-ee-support/pom.xml | 4 +-
integration-tests/jakarta-ee/pom.xml | 45 +-------
.../src/main/resources/setPayaraPort.groovy | 52 +++++++++
.../main/webapp/shiro/auth/unauthenticated.xhtml | 1 -
.../jakarta-ee/src/main/webapp/shiro/form.xhtml | 2 +-
.../main/webapp/shiro/unprotected/manybeans.xhtml | 2 +-
integration-tests/jaxrs/app/pom.xml | 6 +-
.../resources/META-INF/resources/WEB-INF/shiro.ini | 4 +-
.../jaxrs/app/src/main/webapp/WEB-INF/shiro.ini | 4 +-
integration-tests/jaxrs/meecrowave/pom.xml | 2 +-
integration-tests/jaxrs/openliberty/pom.xml | 2 +-
integration-tests/jaxrs/pom.xml | 2 +-
integration-tests/jaxrs/tests/pom.xml | 7 +-
integration-tests/meecrowave-support/pom.xml | 29 ++++-
integration-tests/pom.xml | 2 +-
integration-tests/support/pom.xml | 9 +-
.../support/src/main/resources/createKeyStore.sh | 3 +-
lang/pom.xml | 2 +-
.../org/apache/shiro/lang/io/XmlSerializer.java | 2 +-
mvnw | 50 +++++++--
mvnw.cmd | 56 ++++++++--
pom.xml | 74 +++++++------
samples/aspectj/pom.xml | 2 +-
samples/guice/pom.xml | 2 +-
samples/guice/src/main/webapp/WEB-INF/shiro.ini | 6 +-
samples/guice/src/main/webapp/account/index.jsp | 2 +-
samples/guice/src/main/webapp/include.jsp | 2 +-
samples/guice/src/main/webapp/index.jsp | 2 +-
samples/guice/src/main/webapp/style.css | 2 +-
samples/pom.xml | 2 +-
samples/quickstart-guice/pom.xml | 4 +-
samples/quickstart/pom.xml | 4 +-
samples/servlet-plugin/pom.xml | 2 +-
.../src/main/webapp/WEB-INF/shiro.ini | 6 +-
.../src/main/webapp/account/index.jsp | 2 +-
samples/servlet-plugin/src/main/webapp/include.jsp | 2 +-
samples/servlet-plugin/src/main/webapp/index.jsp | 2 +-
samples/servlet-plugin/src/main/webapp/style.css | 2 +-
samples/spring-boot-3-web/pom.xml | 32 +++++-
.../src/main/resources/application.properties | 2 +-
.../src/main/resources/log4j2.properties | 14 ++-
.../src/main/resources/templates/account-info.html | 2 +-
.../src/main/resources/templates/error.html | 4 +-
.../main/resources/templates/fragments/head.html | 2 +-
.../src/main/resources/templates/hello.html | 2 +-
.../src/main/resources/templates/login.html | 2 +-
samples/spring-boot-web/pom.xml | 18 +++-
.../src/main/resources/application.properties | 2 +-
.../src/main/resources/templates/account-info.html | 2 +-
.../src/main/resources/templates/error.html | 4 +-
.../main/resources/templates/fragments/head.html | 2 +-
.../src/main/resources/templates/hello.html | 2 +-
.../src/main/resources/templates/login.html | 2 +-
samples/spring-boot/README.md | 1 -
samples/spring-boot/pom.xml | 2 +-
.../src/main/resources/application.properties | 2 +-
samples/spring-hibernate/pom.xml | 2 +-
.../shiro/samples/sprhib/dao/HibernateUserDAO.java | 1 -
.../apache/shiro/samples/sprhib/model/Role.java | 2 -
.../apache/shiro/samples/sprhib/model/User.java | 2 -
.../shiro/samples/sprhib/security/SampleRealm.java | 1 -
.../src/main/resources/ehcache.xml | 2 +-
.../src/main/resources/hibernate.cfg.xml | 2 +-
.../src/main/webapp/WEB-INF/jsp/editUser.jsp | 2 +-
.../src/main/webapp/WEB-INF/jsp/login.jsp | 2 +-
.../src/main/webapp/WEB-INF/jsp/signup.jsp | 2 +-
samples/spring-hibernate/src/main/webapp/index.jsp | 2 +-
.../src/main/webapp/styles/sample.css | 2 +-
samples/spring-mvc/pom.xml | 2 +-
.../src/main/webapp/WEB-INF/resources/include.jsp | 2 +-
.../main/webapp/WEB-INF/resources/sampleIndex.jsp | 2 +-
samples/spring-mvc/src/main/webapp/logo.png | Bin 10883 -> 9480 bytes
samples/spring-mvc/src/main/webapp/shiro.css | 2 +-
samples/spring/pom.xml | 4 +-
.../src/main/resources/application.properties | 1 -
samples/web-jakarta/pom.xml | 41 ++++++-
.../web-jakarta/src/main/webapp/WEB-INF/shiro.ini | 5 +-
samples/web/pom.xml | 2 +-
samples/web/src/main/webapp/WEB-INF/shiro.ini | 5 +-
samples/web/src/main/webapp/account/index.jsp | 2 +-
samples/web/src/main/webapp/include.jsp | 2 +-
samples/web/src/main/webapp/index.jsp | 2 +-
samples/web/src/main/webapp/style.css | 2 +-
shiro.doap.rdf | 2 +-
src/japicmp/postAnalysisScript.groovy | 2 +-
src/license/header.txt | 2 +-
src/license/header_format.xml | 2 +-
src/site/resources/images/apache-shiro-logo.png | Bin 20928 -> 11859 bytes
src/site/resources/images/asf_logo.png | Bin 18372 -> 12191 bytes
src/site/site.xml | 2 +-
support/aspectj/pom.xml | 2 +-
.../org/apache/shiro/aspectj/package-info.java | 3 -
support/aspectj/src/main/resources/META-INF/NOTICE | 6 +-
support/cdi/pom.xml | 2 +-
support/ehcache/pom.xml | 2 +-
.../org/apache/shiro/cache/ehcache/EhCache.java | 2 +-
support/ehcache/src/main/resources/META-INF/NOTICE | 6 +-
.../org/apache/shiro/cache/ehcache/ehcache.xml | 2 -
support/features/pom.xml | 2 +-
support/guice/pom.xml | 7 +-
.../org/apache/shiro/guice/web/ShiroWebModule.java | 2 +-
support/guice/src/main/resources/META-INF/NOTICE | 4 +-
support/hazelcast/pom.xml | 2 +-
.../hazelcast/src/main/resources/META-INF/NOTICE | 6 +-
support/jakarta-ee/pom.xml | 6 +-
support/jaxrs/pom.xml | 2 +-
support/jcache/pom.xml | 2 +-
.../apache/shiro/cache/jcache/JCacheManager.java | 2 +-
support/jcache/src/main/resources/META-INF/NOTICE | 4 +-
support/pom.xml | 2 +-
support/quartz/pom.xml | 2 +-
support/quartz/src/main/resources/META-INF/NOTICE | 4 +-
support/servlet-plugin/pom.xml | 4 +-
support/spring-boot/pom.xml | 10 +-
support/spring-boot/spring-boot-starter/pom.xml | 32 +++++-
.../src/main/resources/META-INF/NOTICE | 6 +-
.../additional-spring-configuration-metadata.json | 2 +-
.../src/main/resources/META-INF/spring.factories | 2 +-
.../src/main/resources/META-INF/spring.provides | 2 +-
...rk.boot.autoconfigure.AutoConfiguration.imports | 2 +-
.../spring-boot/spring-boot-web-starter/pom.xml | 39 ++++++-
support/spring/pom.xml | 2 +-
support/spring/src/main/resources/META-INF/NOTICE | 4 +-
.../SchemaAuthorizationAnnotationTest-context.xml | 2 +-
test-coverage/pom.xml | 1 -
tools/hasher/pom.xml | 2 +-
.../java/org/apache/shiro/tools/hasher/Hasher.java | 20 ++--
.../org/apache/shiro/tools/hasher/HasherTest.java | 15 +++
tools/pom.xml | 3 +-
web/pom.xml | 2 +-
.../apache/shiro/web/env/EnvironmentLoader.java | 2 +-
.../shiro/web/filter/AccessControlFilter.java | 2 +-
.../web/filter/authc/HttpAuthenticationFilter.java | 33 ++++--
.../apache/shiro/web/servlet/AbstractFilter.java | 1 -
.../shiro/web/servlet/AbstractShiroFilter.java | 4 +-
.../apache/shiro/web/servlet/IniShiroFilter.java | 12 +--
.../org/apache/shiro/web/servlet/ShiroFilter.java | 2 +-
.../java/org/apache/shiro/web/util/CorsUtils.java | 69 ++++++++++++
.../BearerHttpFilterAuthenticationTest.groovy | 41 ++++++-
.../authc/BasicHttpFilterAuthenticationTest.java | 34 ++++++
.../org/apache/shiro/web/util/CorsUtilsTest.java | 71 ++++++++++++
web/src/test/resources/IniShiroFilterTest.ini | 1 -
223 files changed, 1556 insertions(+), 469 deletions(-)
copy .mvn/wrapper/maven-wrapper.properties => .editorconfig (74%)
copy .mvn/wrapper/maven-wrapper.properties => .github/labeler.yml (65%)
copy .mvn/wrapper/maven-wrapper.properties =>
.github/linters/.markdown-lint.yml (63%)
copy .mvn/wrapper/maven-wrapper.properties => .github/linters/.yaml-lint.yml
(79%)
create mode 100644 .github/linters/codespell.txt
copy .mvn/wrapper/maven-wrapper.properties =>
.github/workflows/dependency-review.yml (66%)
copy .mvn/wrapper/maven-wrapper.properties => .github/workflows/labeler.yml
(65%)
create mode 100644 .github/workflows/pre-commit.yml
rename .mvn/{maven.properties => maven-user.properties} (100%)
create mode 100644 .pre-commit-config.yaml
create mode 100644
core/src/test/java/org/apache/shiro/realm/AuthenticatingRealmJavaTest.java
copy
integration-tests/jakarta-ee/src/main/resources/META-INF/shiro-native-sessions.ini
=>
core/src/test/resources/org/apache/shiro/realm/activedirectory/AdRealm.withPrincipalSuffix.ini
(70%)
create mode 100644
integration-tests/jakarta-ee/src/main/resources/setPayaraPort.groovy
copy
core/src/test/resources/org/apache/shiro/config/IniSecurityManagerFactoryTest.ini
=> samples/spring-boot-3-web/src/main/resources/log4j2.properties (65%)
create mode 100644 web/src/main/java/org/apache/shiro/web/util/CorsUtils.java
create mode 100644
web/src/test/java/org/apache/shiro/web/util/CorsUtilsTest.java
