This is an automated email from the ASF dual-hosted git repository.
quantranhong1999 pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
from 729ed81d65 [FIX] Better handle InterruptedException in
receiveMessageInTimespan (#3083)
new 9827c4b455 JAMES-4210 Introduce protocol-neutral SASL SPI
new c1b7fe031e JAMES-4210 Add built-in SASL mechanisms module
new d39a9fc1e2 JAMES-4210 Resolve configured SASL factories with Guice
new a1a6dedf4e JAMES-4210 Adapt IMAP authentication processors to SASL
exchanges
new d08c49f1fc JAMES-4210 Wire per-server IMAP SASL configuration in Guice
new e3bbd0fa3d JAMES-4210 Move IMAP auth configuration out of Netty
sessions
new 71f857b72b JAMES-4210 Document custom IMAP SASL extension support
new 2f7706bdd1 JAMES-4210 Cover IMAP SASL delegated channel reporting
The 8 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:
examples/custom-imap/README.md | 75 ++++
examples/custom-imap/pom.xml | 6 +
.../sample-configuration/imapserver.xml | 7 +
.../imap/sasl/ExampleTokenSaslConfiguration.java | 28 +-
.../imap/sasl/ExampleTokenSaslMechanism.java | 99 ++++++
.../sasl/ExampleTokenSaslMechanismFactory.java | 20 +-
.../custom-imap/src/main/resources/imapserver.xml | 16 +-
.../examples/imap/CustomSaslMechanismTest.java | 209 +++++++++++
pom.xml | 5 +
.../apache/james/protocols/api/OIDCSASLParser.java | 60 ++--
.../api/sasl/SaslAuthenticationResult.java | 15 +-
.../protocols/api/sasl/SaslAuthenticator.java | 24 +-
.../james/protocols/api/sasl/SaslExchange.java | 33 +-
.../james/protocols/api/sasl/SaslFailure.java | 66 ++++
.../james/protocols/api/sasl/SaslIdentity.java | 15 +-
.../protocols/api/sasl/SaslInitialRequest.java | 28 +-
.../SaslMechanism.java} | 91 +++--
.../protocols/api/sasl/SaslMechanismFactory.java} | 13 +-
.../protocols/api/sasl/SaslMechanismNames.java | 11 +-
.../apache/james/protocols/api/sasl/SaslStep.java | 65 ++--
.../api/sasl/SaslMechanismContractTest.java | 249 +++++++++++++
protocols/imap/pom.xml | 4 +
.../apache/james/imap/api/process/ImapSession.java | 24 --
.../imap/encode/AuthenticateResponseEncoder.java | 6 +-
.../apache/james/imap/encode/FakeImapSession.java | 21 --
.../message/response/AuthenticateResponse.java | 16 +-
.../imap/processor/AbstractAuthProcessor.java | 179 ++++------
.../imap/processor/AuthenticateProcessor.java | 393 ++++++++++++++-------
.../james/imap/processor/DefaultProcessor.java | 49 ++-
.../james/imap/processor/EnableProcessor.java | 12 +-
.../james/imap/processor/LoginProcessor.java | 39 +-
.../main/DefaultImapProcessorFactory.java | 70 +++-
.../james/imap/processor/sasl/ImapSaslBridge.java | 104 ++++++
.../imap/processor/AuthenticateProcessorTest.java | 277 +++++++++++++++
.../imap/processor/sasl/ImapSaslBridgeTest.java | 240 +++++++++++++
protocols/pom.xml | 1 +
protocols/{api => sasl}/pom.xml | 19 +-
.../sasl/BuiltInSaslMechanismFactories.java | 46 +--
.../protocols/sasl/JamesSaslAuthenticator.java | 118 +++++++
.../sasl/OauthBearerSaslMechanismFactory.java | 21 +-
.../protocols/sasl/OidcSaslMechanismFactory.java | 30 +-
.../protocols/sasl/PlainSaslMechanismFactory.java | 38 +-
.../sasl/XOauth2SaslMechanismFactory.java | 21 +-
.../protocols/sasl/oidc/OAuthSaslMechanism.java | 105 ++++++
.../protocols/sasl/plain/PlainSaslMechanism.java | 144 ++++++++
.../protocols/sasl/oidc/OidcSaslMechanismTest.java | 175 +++++++++
.../sasl/plain/PlainSaslMechanismTest.java | 194 ++++++++++
server/container/guice/common/pom.xml | 8 +
.../james/modules/SaslMechanismFactories.java} | 11 +-
.../james/utils/GuiceSaslMechanismResolver.java | 89 +++++
.../TestingDefaultPackageSaslMechanismFactory.java | 16 +-
.../ConfigurableFakeSaslMechanismFactory.java | 15 +-
.../utils/ExternalFakeSaslMechanismFactory.java | 15 +-
.../james/utils/FixedNameSaslMechanism.java} | 51 ++-
.../utils/GuiceSaslMechanismResolverTest.java | 242 +++++++++++++
server/container/guice/protocols/imap/pom.xml | 4 +
.../james/modules/protocols/IMAPServerModule.java | 84 ++++-
.../ImapDefaultSaslMechanismFactories.java} | 11 +-
.../modules/protocols/IMAPServerModuleTest.java | 106 ++++++
.../apache/james/imapserver/netty/IMAPServer.java | 64 ----
.../netty/ImapChannelUpstreamHandler.java | 18 +-
.../james/imapserver/netty/NettyImapSession.java | 32 +-
.../META-INF/spring/imapserver-context.xml | 20 +-
.../imapserver/netty/AbstractIMAPServerTest.java | 3 +-
.../MemoryWebAdminServerIntegrationTest.java | 30 ++
.../src/test/resources/imapserver.xml | 5 +
66 files changed, 3517 insertions(+), 788 deletions(-)
copy
server/container/core/src/main/java/org/apache/james/server/core/configuration/ConfigurationProvider.java
=>
examples/custom-imap/src/main/java/org/apache/james/examples/imap/sasl/ExampleTokenSaslConfiguration.java
(57%)
create mode 100644
examples/custom-imap/src/main/java/org/apache/james/examples/imap/sasl/ExampleTokenSaslMechanism.java
copy
server/container/core/src/main/java/org/apache/james/server/core/configuration/ConfigurationProvider.java
=>
examples/custom-imap/src/main/java/org/apache/james/examples/imap/sasl/ExampleTokenSaslMechanismFactory.java
(73%)
create mode 100644
examples/custom-imap/src/test/java/org/apache/james/examples/imap/CustomSaslMechanismTest.java
copy
mailbox/api/src/main/java/org/apache/james/mailbox/exception/SubscriptionException.java
=>
protocols/api/src/main/java/org/apache/james/protocols/api/sasl/SaslAuthenticationResult.java
(73%)
copy mailbox/api/src/main/java/org/apache/james/mailbox/Authenticator.java =>
protocols/api/src/main/java/org/apache/james/protocols/api/sasl/SaslAuthenticator.java
(62%)
copy
server/dns-service/dnsservice-api/src/main/java/org/apache/james/dnsservice/api/DNSServiceMBean.java
=>
protocols/api/src/main/java/org/apache/james/protocols/api/sasl/SaslExchange.java
(69%)
create mode 100644
protocols/api/src/main/java/org/apache/james/protocols/api/sasl/SaslFailure.java
copy mpt/core/src/main/java/org/apache/james/mpt/api/UserAdder.java =>
protocols/api/src/main/java/org/apache/james/protocols/api/sasl/SaslIdentity.java
(79%)
copy
server/container/guice/protocols/webadmin-data/src/main/java/org/apache/james/modules/server/DropListsRoutesModule.java
=>
protocols/api/src/main/java/org/apache/james/protocols/api/sasl/SaslInitialRequest.java
(64%)
copy
protocols/api/src/main/java/org/apache/james/protocols/api/{ProtocolConfiguration.java
=> sasl/SaslMechanism.java} (66%)
copy
protocols/{imap/src/main/java/org/apache/james/imap/api/ConnectionCheckFactory.java
=>
api/src/main/java/org/apache/james/protocols/api/sasl/SaslMechanismFactory.java}
(79%)
copy
backends-common/opensearch/src/test/java/org/apache/james/backends/opensearch/DockerAuthOpenSearchSingleton.java
=>
protocols/api/src/main/java/org/apache/james/protocols/api/sasl/SaslMechanismNames.java
(81%)
copy
mailbox/store/src/main/java/org/apache/james/mailbox/store/transaction/Mapper.java
=>
protocols/api/src/main/java/org/apache/james/protocols/api/sasl/SaslStep.java
(51%)
create mode 100644
protocols/api/src/test/java/org/apache/james/protocols/api/sasl/SaslMechanismContractTest.java
create mode 100644
protocols/imap/src/main/java/org/apache/james/imap/processor/sasl/ImapSaslBridge.java
create mode 100644
protocols/imap/src/test/java/org/apache/james/imap/processor/AuthenticateProcessorTest.java
create mode 100644
protocols/imap/src/test/java/org/apache/james/imap/processor/sasl/ImapSaslBridgeTest.java
copy protocols/{api => sasl}/pom.xml (83%)
copy
server/container/guice/mailbox/src/test/java/org/apache/james/modules/mailbox/ConfiguredListener.java
=>
protocols/sasl/src/main/java/org/apache/james/protocols/sasl/BuiltInSaslMechanismFactories.java
(56%)
create mode 100644
protocols/sasl/src/main/java/org/apache/james/protocols/sasl/JamesSaslAuthenticator.java
copy
server/container/core/src/main/java/org/apache/james/server/core/configuration/ConfigurationProvider.java
=>
protocols/sasl/src/main/java/org/apache/james/protocols/sasl/OauthBearerSaslMechanismFactory.java
(71%)
copy
server/container/core/src/main/java/org/apache/james/server/core/configuration/ConfigurationProvider.java
=>
protocols/sasl/src/main/java/org/apache/james/protocols/sasl/OidcSaslMechanismFactory.java
(57%)
copy
server/container/spring/src/main/java/org/apache/james/container/spring/lifecycle/ConfigurableBeanPostProcessor.java
=>
protocols/sasl/src/main/java/org/apache/james/protocols/sasl/PlainSaslMechanismFactory.java
(55%)
copy
server/container/core/src/main/java/org/apache/james/server/core/configuration/ConfigurationProvider.java
=>
protocols/sasl/src/main/java/org/apache/james/protocols/sasl/XOauth2SaslMechanismFactory.java
(71%)
create mode 100644
protocols/sasl/src/main/java/org/apache/james/protocols/sasl/oidc/OAuthSaslMechanism.java
create mode 100644
protocols/sasl/src/main/java/org/apache/james/protocols/sasl/plain/PlainSaslMechanism.java
create mode 100644
protocols/sasl/src/test/java/org/apache/james/protocols/sasl/oidc/OidcSaslMechanismTest.java
create mode 100644
protocols/sasl/src/test/java/org/apache/james/protocols/sasl/plain/PlainSaslMechanismTest.java
copy
server/container/guice/{onami/src/test/java/org/apache/james/onami/lifecycle/TestAnnotationB.java
=> common/src/main/java/org/apache/james/modules/SaslMechanismFactories.java}
(87%)
create mode 100644
server/container/guice/common/src/main/java/org/apache/james/utils/GuiceSaslMechanismResolver.java
copy
protocols/imap/src/main/java/org/apache/james/imap/api/DefaultConnectionCheckFactory.java
=>
server/container/guice/common/src/test/java/org/apache/james/protocols/sasl/TestingDefaultPackageSaslMechanismFactory.java
(74%)
copy
protocols/imap/src/main/java/org/apache/james/imap/api/DefaultConnectionCheckFactory.java
=>
server/container/guice/common/src/test/java/org/apache/james/utils/ConfigurableFakeSaslMechanismFactory.java
(75%)
copy
protocols/imap/src/main/java/org/apache/james/imap/api/DefaultConnectionCheckFactory.java
=>
server/container/guice/common/src/test/java/org/apache/james/utils/ExternalFakeSaslMechanismFactory.java
(77%)
copy
server/container/guice/{utils/src/main/java/org/apache/james/utils/FullyQualifiedClassName.java
=> common/src/test/java/org/apache/james/utils/FixedNameSaslMechanism.java}
(54%)
create mode 100644
server/container/guice/common/src/test/java/org/apache/james/utils/GuiceSaslMechanismResolverTest.java
copy
server/container/guice/{onami/src/test/java/org/apache/james/onami/lifecycle/TestAnnotationA.java
=>
protocols/imap/src/main/java/org/apache/james/modules/protocols/ImapDefaultSaslMechanismFactories.java}
(87%)
create mode 100644
server/container/guice/protocols/imap/src/test/java/org/apache/james/modules/protocols/IMAPServerModuleTest.java
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
