honeymoose
/
org.hl7.fhir.core
mirror of https://github.com/hapifhir/org.hl7.fhir.core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix up generation ValidationFragment generation parsing SHC fragments

This commit is contained in:
Grahame Grieve 2023-09-27 06:40:14 +10:00
parent 8ea4fe74c7
commit 2fdf1f626d
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/elementmodel/SHCParser.java
View File

@ -83,7 +83,7 @@ public class SHCParser extends ParserBase {
byte[] content = TextFile.streamToBytes(inStream); byte[] content = TextFile.streamToBytes(inStream);
ByteArrayInputStream stream = new ByteArrayInputStream(content); ByteArrayInputStream stream = new ByteArrayInputStream(content);
List<ValidatedFragment> res = new ArrayList<>(); List<ValidatedFragment> res = new ArrayList<>();
ValidatedFragment shc = new ValidatedFragment("shc", "json", content); ValidatedFragment shc = new ValidatedFragment("shc", "txt", content);
res.add(shc); res.add(shc);
String src = TextFile.streamToString(stream).trim(); String src = TextFile.streamToString(stream).trim();
@ -121,6 +121,8 @@ public class SHCParser extends ParserBase {
return res; return res;
} }
ValidatedFragment bnd = new ValidatedFragment("payload", "json", jwt.payloadSrc);
res.add(bnd);
checkNamedProperties(shc.getErrors(), jwt.getPayload(), prefix+"payload", "iss", "nbf", "vc"); checkNamedProperties(shc.getErrors(), jwt.getPayload(), prefix+"payload", "iss", "nbf", "vc");
checkProperty(shc.getErrors(), jwt.getPayload(), prefix+"payload", "iss", true, "String"); checkProperty(shc.getErrors(), jwt.getPayload(), prefix+"payload", "iss", true, "String");
checkProperty(shc.getErrors(), jwt.getPayload(), prefix+"payload", "nbf", true, "Number"); checkProperty(shc.getErrors(), jwt.getPayload(), prefix+"payload", "nbf", true, "Number");
@ -165,8 +167,6 @@ public class SHCParser extends ParserBase {
return res; return res;
} }
// ok. all checks passed, we can now validate the bundle // ok. all checks passed, we can now validate the bundle
ValidatedFragment bnd = new ValidatedFragment(path, "json", org.hl7.fhir.utilities.json.parser.JsonParser.composeBytes(cs.getJsonObject("fhirBundle")));
res.add(bnd);
bnd.setElement(jsonParser.parse(bnd.getErrors(), cs.getJsonObject("fhirBundle"))); bnd.setElement(jsonParser.parse(bnd.getErrors(), cs.getJsonObject("fhirBundle")));
} }
return res; return res;
@ -234,6 +234,9 @@ public class SHCParser extends ParserBase {
private JsonObject header; private JsonObject header;
private JsonObject payload; private JsonObject payload;
private byte[] headerSrc;
private byte[] payloadSrc;
public JsonObject getHeader() { public JsonObject getHeader() {
return header; return header;
} }
@ -246,6 +249,19 @@ public class SHCParser extends ParserBase {
public void setPayload(JsonObject payload) { public void setPayload(JsonObject payload) {
this.payload = payload; this.payload = payload;
} }
public byte[] getHeaderSrc() {
return headerSrc;
}
public void setHeaderSrc(byte[] headerSrc) {
this.headerSrc = headerSrc;
}
public byte[] getPayloadSrc() {
return payloadSrc;
}
public void setPayloadSrc(byte[] payloadSrc) {
this.payloadSrc = payloadSrc;
}
} }
private static final int BUFFER_SIZE = 1024; private static final int BUFFER_SIZE = 1024;
@ -287,10 +303,12 @@ public class SHCParser extends ParserBase {
throw new FHIRException("The input is not a valid base 64 encoded string.", e); throw new FHIRException("The input is not a valid base 64 encoded string.", e);
} }
JWT res = new JWT(); JWT res = new JWT();
res.setHeaderSrc(headerJson);
res.header = org.hl7.fhir.utilities.json.parser.JsonParser.parseObject(headerJson); res.header = org.hl7.fhir.utilities.json.parser.JsonParser.parseObject(headerJson);
if ("DEF".equals(res.header.asString("zip"))) { if ("DEF".equals(res.header.asString("zip"))) {
payloadJson = inflate(payloadJson); payloadJson = inflate(payloadJson);
} }
res.setPayloadSrc(payloadJson);
res.payload = org.hl7.fhir.utilities.json.parser.JsonParser.parseObject(TextFile.bytesToString(payloadJson), true); res.payload = org.hl7.fhir.utilities.json.parser.JsonParser.parseObject(TextFile.bytesToString(payloadJson), true);
checkSignature(jwt, res, errors, "jwt", org.hl7.fhir.utilities.json.parser.JsonParser.compose(res.payload)); checkSignature(jwt, res, errors, "jwt", org.hl7.fhir.utilities.json.parser.JsonParser.compose(res.payload));