Skip to content

Authentication Metadata Extension support #731

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
merged 8 commits into from
Jan 27, 2020
Merged

Authentication Metadata Extension support #731

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
16abb9e
fixes tuples bytebufs
OlegDokuka Dec 18, 2019
c127f4b
provides first draft implementation of AuthMetadataFlyweight
OlegDokuka Dec 18, 2019
df5bb22
provides full implementation of AuthMetadataFlyweight
OlegDokuka Dec 20, 2019
bab075c
provides draft of AuthMetadata
OlegDokuka Dec 20, 2019
dfe5e53
fixes allowed username max length
OlegDokuka Jan 11, 2020
72d2564
removes eager release
OlegDokuka Jan 11, 2020
7a73cc5
fixes formating
OlegDokuka Jan 27, 2020
e392ad8
provides minor fixes
OlegDokuka Jan 27, 2020
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 rsocket-core/src/main/java/io/rsocket/buffer/AbstractTupleByteBuf.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,7 @@ public int writeCharSequence(CharSequence sequence, Charset charset) {

@Override
public ByteBuffer internalNioBuffer(int index, int length) {
throw new UnsupportedOperationException();
return nioBuffer(index, length);
}

@Override
Expand Down
24 changes: 13 additions & 11 deletions rsocket-core/src/main/java/io/rsocket/buffer/Tuple2ByteBuf.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,12 @@ public ByteBuffer[] _nioBuffers(int index, int length) {

@Override
public ByteBuf getBytes(int index, ByteBuf dst, int dstIndex, int length) {
checkDstIndex(index, length, dstIndex, dst.capacity());
if (length == 0) {
return this;
}

// FIXME: check twice here
long ri = calculateRelativeIndex(index);
index = (int) (ri & Integer.MAX_VALUE);
switch ((int) ((ri & MASK) >>> 32L)) {
Expand Down Expand Up @@ -165,20 +171,22 @@ public ByteBuf getBytes(int index, ByteBuf dst, int dstIndex, int length) {
@Override
public ByteBuf getBytes(int index, byte[] dst, int dstIndex, int length) {
ByteBuf dstBuf = Unpooled.wrappedBuffer(dst);
int min = Math.min(dst.length, capacity);
return getBytes(0, dstBuf, index, min);
return getBytes(index, dstBuf, dstIndex, length);
}

@Override
public ByteBuf getBytes(int index, ByteBuffer dst) {
ByteBuf dstBuf = Unpooled.wrappedBuffer(dst);
int min = Math.min(dst.limit(), capacity);
return getBytes(0, dstBuf, index, min);
return getBytes(index, dstBuf);
}

@Override
public ByteBuf getBytes(int index, final OutputStream out, int length) throws IOException {
checkIndex(index, length);
if (length == 0) {
return this;
}

long ri = calculateRelativeIndex(index);
index = (int) (ri & Integer.MAX_VALUE);
switch ((int) ((ri & MASK) >>> 32L)) {
Expand Down Expand Up @@ -354,18 +362,12 @@ protected void deallocate() {

@Override
public String toString(Charset charset) {
StringBuilder builder = new StringBuilder(3);
StringBuilder builder = new StringBuilder(capacity);
builder.append(one.toString(charset));
builder.append(two.toString(charset));
return builder.toString();
}

@Override
public String toString(int index, int length, Charset charset) {
// TODO - make this smarter
return toString(charset).substring(index, length);
}

@Override
public String toString() {
return "Tuple2ByteBuf{"
Expand Down
12 changes: 2 additions & 10 deletions rsocket-core/src/main/java/io/rsocket/buffer/Tuple3ByteBuf.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,15 +235,13 @@ public ByteBuf getBytes(int index, ByteBuf dst, int dstIndex, int length) {
@Override
public ByteBuf getBytes(int index, byte[] dst, int dstIndex, int length) {
ByteBuf dstBuf = Unpooled.wrappedBuffer(dst);
int min = Math.min(dst.length, capacity);
return getBytes(0, dstBuf, index, min);
return getBytes(index, dstBuf, dstIndex, length);
}

@Override
public ByteBuf getBytes(int index, ByteBuffer dst) {
ByteBuf dstBuf = Unpooled.wrappedBuffer(dst);
int min = Math.min(dst.limit(), capacity);
return getBytes(0, dstBuf, index, min);
return getBytes(index, dstBuf);
}

@Override
Expand Down Expand Up @@ -539,12 +537,6 @@ public String toString(Charset charset) {
return builder.toString();
}

@Override
public String toString(int index, int length, Charset charset) {
// TODO - make this smarter
return toString(charset).substring(index, length);
}

@Override
public String toString() {
return "Tuple3ByteBuf{"
Expand Down
Loading