From: Markus Koschany Date: Sun, 18 Oct 2020 15:14:40 +0200 Subject: mina2 event method Fix FTBFS with mina2 2.1.4. Forwarded: no --- .../server/dhcp/protocol/DhcpProtocolHandler.java | 5 +++++ .../directory/server/dns/protocol/DnsProtocolHandler.java | 7 ++++++- .../changepwd/protocol/ChangePasswordProtocolHandler.java | 5 +++++ .../server/kerberos/protocol/KerberosProtocolHandler.java | 5 +++++ .../apache/directory/server/ldap/LdapProtocolHandler.java | 15 --------------- 5 files changed, 21 insertions(+), 16 deletions(-) diff --git a/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/protocol/DhcpProtocolHandler.java b/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/protocol/DhcpProtocolHandler.java index 3457783..6ffbf86 100644 --- a/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/protocol/DhcpProtocolHandler.java +++ b/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/protocol/DhcpProtocolHandler.java @@ -31,6 +31,7 @@ import org.apache.mina.core.service.IoHandler; import org.apache.mina.core.session.IdleStatus; import org.apache.mina.core.session.IoSession; import org.apache.mina.filter.codec.ProtocolCodecFilter; +import org.apache.mina.filter.FilterEvent; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -220,4 +221,8 @@ public class DhcpProtocolHandler implements IoHandler public void inputClosed( IoSession session ) { } + + @Override + public void event(IoSession session, FilterEvent event) { + } } diff --git a/protocol-dns/src/main/java/org/apache/directory/server/dns/protocol/DnsProtocolHandler.java b/protocol-dns/src/main/java/org/apache/directory/server/dns/protocol/DnsProtocolHandler.java index 3e764c8..26b6eb6 100644 --- a/protocol-dns/src/main/java/org/apache/directory/server/dns/protocol/DnsProtocolHandler.java +++ b/protocol-dns/src/main/java/org/apache/directory/server/dns/protocol/DnsProtocolHandler.java @@ -38,6 +38,7 @@ import org.apache.mina.core.service.IoHandler; import org.apache.mina.core.session.IdleStatus; import org.apache.mina.core.session.IoSession; import org.apache.mina.filter.codec.ProtocolCodecFilter; +import org.apache.mina.filter.FilterEvent; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -169,8 +170,12 @@ public class DnsProtocolHandler implements IoHandler return ( this.contextKey ); } - + public void inputClosed( IoSession session ) { } + + @Override + public void event(IoSession session, FilterEvent event) { + } } diff --git a/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/changepwd/protocol/ChangePasswordProtocolHandler.java b/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/changepwd/protocol/ChangePasswordProtocolHandler.java index 661d8c6..d680c25 100644 --- a/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/changepwd/protocol/ChangePasswordProtocolHandler.java +++ b/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/changepwd/protocol/ChangePasswordProtocolHandler.java @@ -46,6 +46,7 @@ import org.apache.mina.core.service.IoHandler; import org.apache.mina.core.session.IdleStatus; import org.apache.mina.core.session.IoSession; import org.apache.mina.filter.codec.ProtocolCodecFilter; +import org.apache.mina.filter.FilterEvent; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -228,4 +229,8 @@ public class ChangePasswordProtocolHandler implements IoHandler public void inputClosed( IoSession session ) { } + + @Override + public void event(IoSession session, FilterEvent event) { + } } diff --git a/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolHandler.java b/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolHandler.java index d0c01fc..3cd350b 100644 --- a/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolHandler.java +++ b/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolHandler.java @@ -43,6 +43,7 @@ import org.apache.directory.shared.kerberos.messages.KrbError; import org.apache.mina.core.service.IoHandler; import org.apache.mina.core.session.IdleStatus; import org.apache.mina.core.session.IoSession; +import org.apache.mina.filter.FilterEvent; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -341,4 +342,8 @@ public class KerberosProtocolHandler implements IoHandler public void inputClosed( IoSession session ) { } + + @Override + public void event(IoSession session, FilterEvent event) { + } } diff --git a/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.java b/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.java index 6b815bd..5a0e928 100644 --- a/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.java +++ b/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.java @@ -179,21 +179,6 @@ class LdapProtocolHandler extends DemuxingIoHandler // and degrade authentication level to 'anonymous' as specified // in the RFC, and this is no threat. - if ( message == SslFilter.SESSION_SECURED ) - { - ExtendedRequest req = - LdapApiServiceFactory.getSingleton().newExtendedRequest( "1.3.6.1.4.1.1466.20037", - "SECURED".getBytes( "ISO-8859-1" ) ); - message = req; - } - else if ( message == SslFilter.SESSION_UNSECURED ) - { - ExtendedRequest req = - LdapApiServiceFactory.getSingleton().newExtendedRequest( "1.3.6.1.4.1.1466.20037", - "SECURED".getBytes( "ISO-8859-1" ) ); - message = req; - } - if ( ( ( Request ) message ).getControls().size() > 0 && message instanceof ResultResponseRequest ) {