akramer/digital-credentials-public-validator
akramer/digital-credentials-public-validator
0
0
Fork 0
Code Issues Pull Requests Activity

Redirect warning in compaction

Browse Source
This commit is contained in:
Xavi Aracil 2022-11-24 13:51:04 +01:00
parent 0ba347d8f0
commit a629fc8372
2 changed files with 41 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
inspector-vc/src/main/java/org/oneedtech/inspect/vc/probe/JsonLDCompactionProve.java
View File

@ -34,29 +34,22 @@ public class JsonLDCompactionProve extends Probe<Credential> {
@Override
public ReportItems run(Credential crd, RunContext ctx) throws Exception {
try {
// compact JSON
JsonDocument jsonDocument = JsonDocument.of(new StringReader(crd.getJson().toString()));
CompactionApi compactApi = JsonLd.compact(jsonDocument, context);
compactApi.options(new JsonLdOptions(new CachingDocumentLoader(localDomains)));
JsonObject compactedObject = compactApi.get();
try {
// compact JSON
JsonDocument jsonDocument = JsonDocument.of(new StringReader(crd.getJson().toString()));
CompactionApi compactApi = JsonLd.compact(jsonDocument, context);
compactApi.options(new JsonLdOptions(new CachingDocumentLoader(localDomains)));
JsonObject compactedObject = compactApi.get();
// TODO: Handle mismatch between URL node source and declared ID.
if (compactedObject.get("id") != null && crd.getResource().getID() != null
&& !compactedObject.get("id").toString().equals(crd.getResource().getID())) {
// TODO: warning!!
// report_message(
// "Node fetched from source {} declared its id as {}".format(
// task_meta['node_id'], node_id), MESSAGE_LEVEL_WARNING, success=False
// ),
}
return success(this, ctx);
} catch (Exception e) {
return fatal("Error while parsing credential: " + e.getMessage(), ctx);
}
// Handle mismatch between URL node source and declared ID.
if (compactedObject.get("id") != null && crd.getResource().getID() != null
&& !compactedObject.get("id").toString().equals(crd.getResource().getID())) {
return warning("Node fetched from source " + crd.getResource().getID() + " declared its id as " + compactedObject.get("id").toString(), ctx);
}
return success(this, ctx);
} catch (Exception e) {
return fatal("Error while parsing credential: " + e.getMessage(), ctx);
}
}
public static final String ID = JsonLDCompactionProve.class.getSimpleName();

27
inspector-vc/src/test/java/org/oneedtech/inspect/vc/OB20Tests.java
View File

@ -2,11 +2,13 @@ package org.oneedtech.inspect.vc;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.oneedtech.inspect.test.Assertions.assertValid;
import static org.oneedtech.inspect.test.Assertions.assertWarning;
import java.net.URI;
import java.net.URISyntaxException;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.oneedtech.inspect.core.Inspector.Behavior;
import org.oneedtech.inspect.core.report.Report;
@ -22,7 +24,7 @@ public class OB20Tests {
validator = new TestBuilder()
.add(new URI("https://www.example.org/"), "ob20/assets")
.set(Behavior.TEST_INCLUDE_SUCCESS, true)
.set(Behavior.TEST_INCLUDE_WARNINGS, true)
.set(Behavior.TEST_INCLUDE_WARNINGS, false)
.set(Behavior.VALIDATOR_FAIL_FAST, true)
.set(OB20Inspector.Behavior.ALLOW_LOCAL_REDIRECTION, true)
.build();
@ -36,4 +38,27 @@ public class OB20Tests {
assertValid(report);
});
}
@Nested
static class WarningTests {
@BeforeAll
static void setup() throws URISyntaxException {
validator = new TestBuilder()
.add(new URI("https://www.example.org/"), "ob20/assets")
.set(Behavior.TEST_INCLUDE_SUCCESS, true)
.set(Behavior.TEST_INCLUDE_WARNINGS, true)
.set(Behavior.VALIDATOR_FAIL_FAST, true)
.set(OB20Inspector.Behavior.ALLOW_LOCAL_REDIRECTION, true)
.build();
}
@Test
void testWarningRedirectionJsonValid() {
assertDoesNotThrow(()->{
Report report = validator.run(Samples.OB20.JSON.WARNING_REDIRECTION_ASSERTION_JSON.asFileResource());
if(verbose) PrintHelper.print(report, true);
assertWarning(report);
});
}
}
}