Mentions légales du service

Skip to content
Snippets Groups Projects

Sequoia code

Open Sequoia code
feature/SEQUOIA-432-sequoia-code into develop
6 unresolved threads
Open Malo Toudic requested to merge feature/SEQUOIA-432-sequoia-code into develop
6 unresolved threads

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
gazelle-sts-service/src/main/java/net/ihe/gazelle/sts/wstrust/ihe/CodedValueFactory.java 0 → 100644
48 supportedCodedValues.put("TREATMENT", "2.16.840.1.113883.3.7204.1.5.2.1");
49 supportedCodedValues.put("PAYMENT", "2.16.840.1.113883.3.7204.1.5.2.1");
50 supportedCodedValues.put("OPERATIONS", "2.16.840.1.113883.3.7204.1.5.2.1");
51 supportedCodedValues.put("PUBLICHEALTH", "2.16.840.1.113883.3.7204.1.5.2.1");
52 supportedCodedValues.put("REQUEST", "2.16.840.1.113883.3.7204.1.5.2.1");
53 supportedCodedValues.put("COVERAGE", "2.16.840.1.113883.3.7204.1.5.2.1");
54
55 // Added 2023.11.20 to support QHIN 1.1
56 supportedCodedValues.put("T-TRTMNT", "2.16.840.1.113883.3.7204.1.5.2.1");
57 supportedCodedValues.put("T-PYMNT", "2.16.840.1.113883.3.7204.1.5.2.1");
58 supportedCodedValues.put("T-HCO", "2.16.840.1.113883.3.7204.1.5.2.1");
59 supportedCodedValues.put("T-PH", "2.16.840.1.113883.3.7204.1.5.2.1");
60 supportedCodedValues.put("T-IAS", "2.16.840.1.113883.3.7204.1.5.2.1");
61 supportedCodedValues.put("T-GOVDTRM", "2.16.840.1.113883.3.7204.1.5.2.1");
62 // End Add 2023.11.20
63 }
  • Malo Toudic
    Malo Toudic @mtoudic started a thread on the diff
    • gazelle-sts-service/src/main/java/net/ihe/gazelle/sts/writers/IHESAMLAssertionWriter.java
    269 300 public void writeStringAttributeValue(String attributeValue) throws ProcessingException {
    270 301 StaxUtil.writeStartElement(writer, ASSERTION_PREFIX, JBossSAMLConstants.ATTRIBUTE_VALUE.get(),
    271 302 ASSERTION_NSURI.get());
    303
    304 //MLB 10-9-2020 added from original code... error in deletion?
    305
    306 // 4-3-13 MLB
    272 307 StaxUtil.writeNameSpace(writer, JBossSAMLURIConstants.XSI_PREFIX.get(), JBossSAMLURIConstants.XSI_NSURI.get());
    273 StaxUtil.writeNameSpace(writer, "xs", JBossSAMLURIConstants.XMLSCHEMA_NSURI.get());
    308 //StaxUtil.writeNameSpace(writer, "xs", JBossSAMLURIConstants.XMLSCHEMA_NSURI.get());
  • Malo Toudic
    Malo Toudic @mtoudic started a thread on the diff
    • gazelle-sts-service/src/main/java/net/ihe/gazelle/sts/wstrust/ihe/IHESAML20TokenAttributeProvider.java
    281 380 AssertionProperties.Keys.ATTRIBUTESTATEMENT_PURPOSEOFUSE_LEVEL2_CODESYSTEMNAME);
    282 381 purposeofuseAttributeValueDisplayName = assertionProperties.getProperty(
    283 382 AssertionProperties.Keys.ATTRIBUTESTATEMENT_PURPOSEOFUSE_LEVEL2_DISPLAYNAME);
    383 } else if (principalName.startsWith(AssertionProfile.SECOND_PURPOSE_OF_USE.getName())) {
    384 String[] tokens = principalName.split("\\.");
    385 String identifier = tokens[1];
    386 CodedValue codedValue = codedValueFactory.getCodedValue(identifier);
    387 purposeofuseAttributeValueCode = codedValue.getCode();
    388 purposeofuseAttributeValueCodeSystem = codedValue.getCodingSystemUID();
    389 purposeofuseAttributeValueCodeSystemName = codedValue.getCodingSystemName();
    390 purposeofuseAttributeValueDisplayName = codedValue.getDisplayName();
  • Malo Toudic
    Malo Toudic @mtoudic started a thread on the diff
    • gazelle-sts-service/src/main/java/net/ihe/gazelle/sts/wstrust/ihe/IHESAML20TokenAttributeProvider.java
    348 455 return codedElementAttribute;
    349 456 }
    350 457
    458 protected AttributeType getCSPAttribute(String attributeValue) {
    459 return getAttribute("csp", "CSP", "foo", attributeValue);
    460 }
    461
    462 protected AttributeType getValidatedAttributesAttribute(String attributeValue) {
    463 return getAttribute("validated_attributes", "Validated Attributes", "", attributeValue);
    464 }
  • Malo Toudic
    Malo Toudic @mtoudic started a thread on the diff
    • gazelle-sts-service/src/main/java/net/ihe/gazelle/sts/wstrust/ihe/IHESAML20TokenAttributeProvider.java
    202 296 /**
    203 297 * <p>getHomeCommunityIdAttribute.</p>
    204 298 *
    299 * @param attributeName a {@link java.lang.String} object.
    205 300 * @param attributeValue a {@link java.lang.String} object.
    206 301 * @return a {@link org.picketlink.identity.federation.saml.v2.assertion.AttributeType} object.
    207 302 */
    208 protected AttributeType getHomeCommunityIdAttribute(String attributeValue) {
    209 return getAttribute(HOMECOMMUNITYID_NAME, HOMECOMMUNITYID_FRIENDLYNAME, NAMEFORMAT_URI, attributeValue);
    303 protected AttributeType getHomeCommunityIdAttribute(String attributeName, String attributeValue) {
    304 if (attributeName == null || attributeName.isEmpty()) {
    305 return getAttribute(HOMECOMMUNITYID_NAME, HOMECOMMUNITYID_FRIENDLYNAME, NAMEFORMAT_URI, attributeValue);
    306 } else {
    307 return getAttribute(attributeName, HOMECOMMUNITYID_FRIENDLYNAME, NAMEFORMAT_URI, attributeValue);
    308 }
    210 309 }
    • Comment on lines +303 to 309
      Malo Toudic
      Malo Toudic @mtoudic ·
      Author Owner

      What is the need to change the function? If I understand there could be a HomeCommunityId that doesn't use "urn:ihe:iti:xca:2010:homeCommunityId"?

    • Malo Toudic
      Malo Toudic @mtoudic ·
      Author Owner

      I think I got it, in the Sequoia specific classes it used urn:nhin:names:saml:homeCommunityId. This changed is releated to the "We added more configuration to allow the baseline (IHE class) to get the Name value at runtime from a properties file." commment right?

    • Please register or sign in to reply
  • Malo Toudic added 1 commit

    added 1 commit

    Compare with previous version

  • Malo Toudic added 1 commit

    added 1 commit

    Compare with previous version

  • Malo Toudic
    Malo Toudic @mtoudic started a thread on the diff
    • gazelle-sts-service/src/main/java/net/ihe/gazelle/sts/wstrust/ihe/IHESAML20TokenAttributeProvider.java
    204
    205 logger.warn("MLB DEBUG 2022: In getSubjectIdAttribute: " + attributeValue);
    206 if (attributeValue .equals("valid")) {
    207 logger.warn("MLB DEBUG 2022 valid branch: In getSubjectIdAttribute if branch: Found " + attributeValue );
    208 //return getAttribute(SUBJECTID_NAME, SUBJECTID_FRIENDLYNAME, NAMEFORMAT_BASIC, "urn:oid:2.16.840.1.113883.3.7418.2.1");
    209 // This return WORKS fine returning the value
    210 // 3-31-2023 MLB changed return getAttribute(SUBJECTID_NAME, SUBJECTID_FRIENDLYNAME, NAMEFORMAT_URI,"urn:oid:2.16.840.1.113883.3.7418.2.1");
    211 // return getAttribute(SUBJECTID_NAME, SUBJECTID_FRIENDLYNAME, NAMEFORMAT_URI,"urn:oid:2.16.840.1.113883.3.7418.2.1");
    212 // 07-05-2023 MLB changed return getAttribute(SUBJECTID_NAME, SUBJECTID_FRIENDLYNAME, NAMEFORMAT_URI,"urn:oid:2.16.840.1.113883.3.7204.1.3.1.2");
    213 return getAttribute(SUBJECTID_NAME, SUBJECTID_FRIENDLYNAME, NAMEFORMAT_URI,"urn:oid:2.16.840.1.113883.3.7204.1.3.1.2");
    214 }
    215 else {
    216 logger.warn("MLB DEBUG 2022 valid branch: In getSubjectIdAttribute else branch: Found " + attributeValue );
    217 return getAttribute(SUBJECTID_NAME, SUBJECTID_FRIENDLYNAME, NAMEFORMAT_URI, attributeValue);
    218 }
    219 }
    Please register or sign in to reply