Skip to content

Add base64url format to encode and decode functions #1019

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
lvca merged 2 commits into from
Apr 9, 2023
Merged

Add base64url format to encode and decode functions #1019

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
30cac5e
Prepare for https://github.com/ArcadeData/arcadedb/discussions/1016
gramian Apr 8, 2023
c51d45e
Make asString() convert binary types to content's strings
gramian Apr 9, 2023
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
3 changes: 3 additions & 0 deletions engine/src/main/java/com/arcadedb/query/sql/function/misc/SQLFunctionDecode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@ public Object execute( final Object iThis, final Identifiable iCurrentRecord, fi

if (SQLFunctionEncode.FORMAT_BASE64.equalsIgnoreCase(format)) {
return Base64.getDecoder().decode(candidate);
} else if (SQLFunctionEncode.FORMAT_BASE64URL.equalsIgnoreCase(format)) {
final int padding = (candidate.length() % 4 == 2 ? 2 : (candidate.length() % 4 == 3 ? 1 : 0));
return Base64.getDecoder().decode(candidate.replace('-','+').replace('_','/') + "=".repeat(padding));
} else {
throw new CommandSQLParsingException("Unknown format :" + format);
}
Expand Down
9 changes: 7 additions & 2 deletions engine/src/main/java/com/arcadedb/query/sql/function/misc/SQLFunctionEncode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,9 @@
*/
public class SQLFunctionEncode extends SQLFunctionAbstract {

public static final String NAME = "encode";
public static final String FORMAT_BASE64 = "base64";
public static final String NAME = "encode";
public static final String FORMAT_BASE64 = "base64";
public static final String FORMAT_BASE64URL = "base64url";

/**
* Get the date at construction to have the same date for all the iteration.
Expand All @@ -54,6 +55,8 @@ public Object execute(final Object iThis, final Identifiable iCurrentRecord, fin
byte[] data = null;
if (candidate instanceof byte[]) {
data = (byte[]) candidate;
} else if (candidate instanceof String) {
data = ((String) candidate).getBytes();
} else if (candidate instanceof RID) {
final Record rec = ((RID) candidate).getRecord();
if (rec instanceof Binary) {
Expand All @@ -67,6 +70,8 @@ public Object execute(final Object iThis, final Identifiable iCurrentRecord, fin

if (FORMAT_BASE64.equalsIgnoreCase(format)) {
return Base64.getEncoder().encodeToString(data);
} else if (FORMAT_BASE64URL.equalsIgnoreCase(format)) {
return Base64.getEncoder().withoutPadding().encodeToString(data).replace('+','-').replace('/','_');
} else {
throw new CommandSQLParsingException("Unknown format :" + format);
}
Expand Down
9 changes: 7 additions & 2 deletions engine/src/main/java/com/arcadedb/query/sql/method/misc/SQLMethodAsString.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,12 @@ public SQLMethodAsString() {

@Override
public Object execute(final Object iThis, final Identifiable iCurrentRecord, final CommandContext iContext, Object ioResult, final Object[] iParams) {
ioResult = ioResult != null ? ioResult.toString() : null;
return ioResult;
if (ioResult == null) {
return null;
} else if (ioResult instanceof byte[]) {
return new String((byte[]) ioResult);
} else {
return ioResult.toString();
}
}
}