[205027] Implement challenge/response based negotiator

https://bugs.eclipse.org/bugs/show_bug.cgi?id=205027

4 files changed, 12 insertions, 4 deletions

diff --git a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/SecurityTest.java b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/SecurityTest.java
index adef1c6aed..b2f1919778 100644
--- a/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/SecurityTest.java
+++ b/plugins/org.eclipse.net4j.tests/src/org/eclipse/net4j/util/tests/SecurityTest.java
@@ -49,7 +49,7 @@ public class SecurityTest extends AbstractOMTest
     public void transmitBuffer(ByteBuffer buffer)
     {
       buffer.flip();
-      responseContext.getBufferReceiver().receiveBuffer(buffer);
+      responseContext.getBufferReceiver().receiveBuffer(responseContext, buffer);
     }
   };
 
@@ -58,7 +58,7 @@ public class SecurityTest extends AbstractOMTest
     public void transmitBuffer(ByteBuffer buffer)
     {
       buffer.flip();
-      challengeContext.getBufferReceiver().receiveBuffer(buffer);
+      challengeContext.getBufferReceiver().receiveBuffer(challengeContext, buffer);
     }
   };
 
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/security/Negotiator.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/security/Negotiator.java
index 68cfe019e0..64733b043d 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/security/Negotiator.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/security/Negotiator.java
@@ -61,7 +61,7 @@ public abstract class Negotiator extends Lifecycle implements INegotiator, IBuff
     }
   }
 
-  public void receiveBuffer(ByteBuffer buffer)
+  public void receiveBuffer(INegotiationContext context, ByteBuffer buffer)
   {
     checkContext();
 
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/IBufferReceiver.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/IBufferReceiver.java
index b2b95bb3d3..06113dc88d 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/IBufferReceiver.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/IBufferReceiver.java
@@ -17,5 +17,5 @@ import java.nio.ByteBuffer;
  */
 public interface IBufferReceiver
 {
-  public void receiveBuffer(ByteBuffer buffer);
+  public void receiveBuffer(INegotiationContext context, ByteBuffer buffer);
 }
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/INegotiationContext.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/INegotiationContext.java
index 2f785bcd23..756544fb65 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/INegotiationContext.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/security/INegotiationContext.java
@@ -26,4 +26,12 @@ public interface INegotiationContext
   public void negotiationSuccess();
 
   public void negotiationFailure();
+
+  /**
+   * @author Eike Stepper
+   */
+  public interface Receiver
+  {
+    public void receiveBuffer(INegotiationContext context, ByteBuffer buffer);
+  }
 }