Skip to content

int overflow in requestN for Responder #146

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stevegury merged 1 commit into from
Jul 14, 2016
Merged

int overflow in requestN for Responder #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion reactivesocket-core/src/main/java/io/reactivesocket/Frame.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@ public static Frame from(int streamId, int requestN) {
return frame;
}

public static long requestN(final Frame frame) {
public static int requestN(final Frame frame) {
ensureFrameType(FrameType.REQUEST_N, frame);
return RequestNFrameFlyweight.requestN(frame.directBuffer, frame.offset);
}
Expand Down
4 changes: 2 additions & 2 deletions reactivesocket-core/src/main/java/io/reactivesocket/internal/Responder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -735,11 +735,11 @@ public void request(long n) {
if (rn.intValue() > 0) {
// initial requestN back to the requester (subtract 1
// for the initial frame which was already sent)
child.onNext(Frame.RequestN.from(streamId, rn.intValue() - 1));
child.onNext(Frame.RequestN.from(streamId, Math.min(Integer.MAX_VALUE, rn.intValue() - 1)));
Copy link
Copy Markdown
Member

@stevegury stevegury Jul 14, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, based on the spec, the request-n is a 64bits value (it should actually be a 63bits, but that's another story).
https://github.com/ReactiveSocket/reactivesocket/blob/master/Protocol.md#request-n-frame

So instead of downcasting everything to int, we upcasting everything to long.
The RequestNFrame is bogus.

Copy link
Copy Markdown
Member

@stevegury stevegury Jul 14, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I take it back, ReactiveSocket protocol defines the request-n as a 32bits.

Copy link
Copy Markdown
Contributor Author

@NiteshKant NiteshKant Jul 14, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes it is an integer value. So this is ready to merge then?

Copy link
Copy Markdown
Member

@stevegury stevegury Jul 14, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes it is.

}
}, r -> {
// requested
child.onNext(Frame.RequestN.from(streamId, r.intValue()));
child.onNext(Frame.RequestN.from(streamId, Math.min(Integer.MAX_VALUE, r.intValue())));
});
synchronized(Responder.this) {
if(channels.get(streamId) != null) {
Expand Down
80 changes: 64 additions & 16 deletions reactivesocket-core/src/test/java/io/reactivesocket/internal/RequesterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,30 +15,33 @@
*/
package io.reactivesocket.internal;

import static io.reactivesocket.TestUtil.*;
import static org.junit.Assert.*;
import static io.reactivesocket.ConnectionSetupPayload.NO_FLAGS;
import static io.reactivex.Observable.*;

import java.util.Arrays;
import java.util.List;
import java.util.concurrent.TimeUnit;
import java.util.function.Consumer;

import org.junit.Test;

import io.reactivesocket.ConnectionSetupPayload;
import io.reactivesocket.Frame;
import io.reactivesocket.FrameType;
import io.reactivesocket.LatchedCompletable;
import io.reactivesocket.Payload;
import io.reactivesocket.TestConnection;
import io.reactivex.subscribers.TestSubscriber;
import io.reactivesocket.util.PayloadImpl;
import io.reactivex.Observable;
import io.reactivex.subjects.ReplaySubject;
import io.reactivex.subscribers.TestSubscriber;
import org.hamcrest.MatcherAssert;
import org.junit.Test;
import org.reactivestreams.Publisher;
import org.reactivestreams.Subscription;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.TimeUnit;
import java.util.function.Consumer;

import static io.reactivesocket.ConnectionSetupPayload.*;
import static io.reactivesocket.TestUtil.*;
import static io.reactivex.Observable.*;
import static org.hamcrest.Matchers.*;
import static org.junit.Assert.*;

public class RequesterTest
{
final static Consumer<Throwable> ERROR_HANDLER = Throwable::printStackTrace;
Expand Down Expand Up @@ -79,6 +82,30 @@ public void testReqMetaPushCancelBeforeRequestN() throws InterruptedException {
testCancelBeforeRequestN(p.metadataPush(utf8EncodedPayload("hello", null)));
}

@Test()
public void testReqStreamRequestLongMax() throws InterruptedException {
TestConnection testConnection = establishConnection();
Requester p = createClientRequester(testConnection);

testRequestLongMaxValue(p.requestStream(new PayloadImpl("")), testConnection);
}

@Test()
public void testReqSubscriptionRequestLongMax() throws InterruptedException {
TestConnection testConnection = establishConnection();
Requester p = createClientRequester(testConnection);

testRequestLongMaxValue(p.requestSubscription(new PayloadImpl("")), testConnection);
}

@Test()
public void testReqChannelRequestLongMax() throws InterruptedException {
TestConnection testConnection = establishConnection();
Requester p = createClientRequester(testConnection);

testRequestLongMaxValue(p.requestChannel(Publishers.just(new PayloadImpl(""))), testConnection);
}

@Test(timeout=2000)
public void testRequestResponseSuccess() throws InterruptedException {
TestConnection conn = establishConnection();
Expand Down Expand Up @@ -306,14 +333,35 @@ private static <T> void testCancelBeforeRequestN(Publisher<T> source) {
testSubscriber.assertNotComplete();
}

private static Requester createClientRequester() throws InterruptedException {
TestConnection conn = establishConnection();
private static <T> void testRequestLongMaxValue(Publisher<T> source, TestConnection testConnection) {
List<Integer> requestNs = new ArrayList<>();
testConnection.write.add(frame -> {
if (frame.getType() == FrameType.REQUEST_N) {
requestNs.add(Frame.RequestN.requestN(frame));
}
});

TestSubscriber<T> testSubscriber = new TestSubscriber<T>(1L);
source.subscribe(testSubscriber);

testSubscriber.request(Long.MAX_VALUE);
testSubscriber.assertNoErrors();
testSubscriber.assertNotComplete();

MatcherAssert.assertThat("Negative requestNs received.", requestNs, not(contains(-1)));
}

private static Requester createClientRequester(TestConnection connection) throws InterruptedException {
LatchedCompletable rc = new LatchedCompletable(1);
Requester p = Requester.createClientRequester(conn, ConnectionSetupPayload.create("UTF-8", "UTF-8", NO_FLAGS), ERROR_HANDLER, rc);
Requester p = Requester.createClientRequester(connection, ConnectionSetupPayload.create("UTF-8", "UTF-8", NO_FLAGS), ERROR_HANDLER, rc);
rc.await();
return p;
}

private static Requester createClientRequester() throws InterruptedException {
return createClientRequester(establishConnection());
}

private static TestConnection establishConnection() {
return new TestConnection();
}
Expand Down