SHIBUI-1262 [1307,1308 WIP]

TIER · Jun 3, 2019 · 3610ed1 · 3610ed1
1 parent 7c4aced
commit 3610ed1
Show file tree

Hide file tree

Showing 12 changed files with 78 additions and 1 deletion.
diff --git a/...a/edu/internet2/tier/shibboleth/admin/ui/domain/AbstractAttributeExtensibleXMLObject.java b/...a/edu/internet2/tier/shibboleth/admin/ui/domain/AbstractAttributeExtensibleXMLObject.java
@@ -1,6 +1,7 @@
 package edu.internet2.tier.shibboleth.admin.ui.domain;
 
 import lombok.EqualsAndHashCode;
+import org.hibernate.envers.Audited;
 import org.opensaml.core.xml.AttributeExtensibleXMLObject;
 import org.opensaml.core.xml.util.AttributeMap;
 
@@ -10,6 +11,7 @@
 
 @MappedSuperclass
 @EqualsAndHashCode(callSuper = true, exclude={"unknownAttributes"})
+@Audited
 public abstract class AbstractAttributeExtensibleXMLObject extends AbstractXMLObject implements AttributeExtensibleXMLObject {
 
     private transient final AttributeMap unknownAttributes;
@@ -24,4 +26,4 @@ public abstract class AbstractAttributeExtensibleXMLObject extends AbstractXMLOb
     public AttributeMap getUnknownAttributes() {
         return this.unknownAttributes;
     }
-}
+}
diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AbstractAuditable.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AbstractAuditable.java
@@ -3,6 +3,7 @@
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.CreationTimestamp;
 import org.hibernate.annotations.UpdateTimestamp;
+import org.hibernate.envers.Audited;
 import org.springframework.data.annotation.CreatedBy;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.annotation.LastModifiedBy;
@@ -22,6 +23,7 @@
 @MappedSuperclass
 @EntityListeners(AuditingEntityListener.class)
 @EqualsAndHashCode
+@Audited
 public abstract class AbstractAuditable implements Auditable {
 
     @Id

diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/Attribute.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/Attribute.java
@@ -27,6 +27,7 @@ public class Attribute extends AbstractAttributeExtensibleXMLObject implements o
 
     @OneToMany(cascade = CascadeType.ALL)
     @OrderColumn
+    @Audited
     private List<AbstractXMLObject> attributeValues = new ArrayList<>();
 
     @Override

diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/EntityAttributes.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/EntityAttributes.java
@@ -1,6 +1,7 @@
 package edu.internet2.tier.shibboleth.admin.ui.domain;
 
 import lombok.EqualsAndHashCode;
+import org.hibernate.envers.Audited;
 import org.opensaml.core.xml.XMLObject;
 import org.opensaml.saml.saml2.core.Assertion;
 
@@ -16,6 +17,7 @@
 
 @Entity
 @EqualsAndHashCode(callSuper = true)
+@Audited
 public class EntityAttributes extends AbstractElementExtensibleXMLObject implements org.opensaml.saml.ext.saml2mdattr.EntityAttributes {
 
     @OneToMany(cascade = CascadeType.ALL)

diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/XSAny.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/XSAny.java
@@ -1,6 +1,7 @@
 package edu.internet2.tier.shibboleth.admin.ui.domain;
 
 import lombok.EqualsAndHashCode;
+import org.hibernate.envers.Audited;
 import org.opensaml.core.xml.util.AttributeMap;
 
 import javax.annotation.Nonnull;
@@ -10,6 +11,7 @@
 
 @Entity
 @EqualsAndHashCode(callSuper = true, exclude = {"unknownAttributes"})
+@Audited
 public class XSAny extends AbstractElementExtensibleXMLObject implements org.opensaml.core.xml.schema.XSAny {
 
     private String textContext;

diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/XSBase64Binary.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/XSBase64Binary.java
@@ -1,12 +1,14 @@
 package edu.internet2.tier.shibboleth.admin.ui.domain;
 
 import lombok.EqualsAndHashCode;
+import org.hibernate.envers.Audited;
 
 import javax.annotation.Nullable;
 import javax.persistence.Entity;
 
 @Entity
 @EqualsAndHashCode(callSuper = true)
+@Audited
 public class XSBase64Binary extends AbstractXMLObject implements org.opensaml.core.xml.schema.XSBase64Binary {
     private String b64value;
 

diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/XSBoolean.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/XSBoolean.java
@@ -1,6 +1,7 @@
 package edu.internet2.tier.shibboleth.admin.ui.domain;
 
 import lombok.EqualsAndHashCode;
+import org.hibernate.envers.Audited;
 import org.opensaml.core.xml.schema.XSBooleanValue;
 
 import javax.annotation.Nullable;
@@ -9,6 +10,7 @@
 
 @Entity
 @EqualsAndHashCode(callSuper = true)
+@Audited
 public class XSBoolean extends AbstractXMLObject implements org.opensaml.core.xml.schema.XSBoolean {
     private String storedValue;
 

diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/XSDateTime.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/XSDateTime.java
@@ -1,6 +1,7 @@
 package edu.internet2.tier.shibboleth.admin.ui.domain;
 
 import lombok.EqualsAndHashCode;
+import org.hibernate.envers.Audited;
 import org.joda.time.DateTime;
 import org.joda.time.chrono.ISOChronology;
 import org.joda.time.format.DateTimeFormatter;
@@ -13,6 +14,7 @@
 
 @Entity
 @EqualsAndHashCode(callSuper = true)
+@Audited
 public class XSDateTime extends AbstractXMLObject implements org.opensaml.core.xml.schema.XSDateTime {
 
     private DateTime dateTime;

diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/XSInteger.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/XSInteger.java
@@ -1,12 +1,14 @@
 package edu.internet2.tier.shibboleth.admin.ui.domain;
 
 import lombok.EqualsAndHashCode;
+import org.hibernate.envers.Audited;
 
 import javax.annotation.Nullable;
 import javax.persistence.Entity;
 
 @Entity
 @EqualsAndHashCode(callSuper = true)
+@Audited
 public class XSInteger extends AbstractXMLObject implements org.opensaml.core.xml.schema.XSInteger {
     private int intValue;
 

diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/XSQName.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/XSQName.java
@@ -2,6 +2,7 @@
 
 import lombok.EqualsAndHashCode;
 import net.shibboleth.utilities.java.support.xml.QNameSupport;
+import org.hibernate.envers.Audited;
 
 import javax.annotation.Nullable;
 import javax.persistence.Entity;
@@ -10,6 +11,7 @@
 
 @Entity
 @EqualsAndHashCode(callSuper = true)
+@Audited
 public class XSQName extends AbstractXMLObject implements org.opensaml.core.xml.schema.XSQName {
     @Nullable
     @Override

diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/XSString.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/XSString.java
@@ -1,12 +1,14 @@
 package edu.internet2.tier.shibboleth.admin.ui.domain;
 
 import lombok.EqualsAndHashCode;
+import org.hibernate.envers.Audited;
 
 import javax.annotation.Nullable;
 import javax.persistence.Entity;
 
 @Entity
 @EqualsAndHashCode(callSuper = true)
+@Audited
 public class XSString extends AbstractXMLObject implements org.opensaml.core.xml.schema.XSString {
     private String xsStringvalue;
 

diff --git a/...2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy b/...2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy
@@ -5,6 +5,7 @@ import edu.internet2.tier.shibboleth.admin.ui.configuration.Internationalization
 import edu.internet2.tier.shibboleth.admin.ui.configuration.SearchConfiguration
 import edu.internet2.tier.shibboleth.admin.ui.configuration.TestConfiguration
 import edu.internet2.tier.shibboleth.admin.ui.domain.AssertionConsumerService
+import edu.internet2.tier.shibboleth.admin.ui.domain.EntityAttributes
 import edu.internet2.tier.shibboleth.admin.ui.domain.EntityDescriptor
 import edu.internet2.tier.shibboleth.admin.ui.domain.KeyDescriptor
 import edu.internet2.tier.shibboleth.admin.ui.domain.SPSSODescriptor
@@ -518,4 +519,59 @@ class EntityDescriptorEnversVersioningTests extends Specification {
         slo.location == 'http://logout'
         slo.binding == 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST'
     }
+
+    @DirtiesContext
+    def "test versioning relying party overrides"() {
+        when:
+        EntityDescriptor ed = new EntityDescriptor()
+        def representation = new EntityDescriptorRepresentation().with {
+            it.relyingPartyOverrides = [signAssertion: true]
+            it.attributeRelease = ['attr1']
+            it
+        }
+
+        def entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService,
+                entityDescriptorRepository,
+                txMgr,
+                entityManager)
+
+        EntityAttributes attrs = entityDescriptorService.getEntityAttributes(getTargetEntityForRevisionIndex(entityDescriptorHistory, 0))
+
+        then:
+        entityDescriptorHistory.size() == 1
+        attrs.attributes[0].attributeValues[0].storedValue == 'true'
+        attrs.attributes[1].attributeValues[0].xsStringvalue == 'attr1'
+
+        when:
+        representation = new EntityDescriptorRepresentation().with {
+            it.relyingPartyOverrides = [signAssertion: false]
+            it.attributeRelease = ['attr1', 'attr2']
+            it
+        }
+
+        //Currently this is the ONLY way to let envers recognize update revision type for EntityDescriptor type
+        //when modifying attributes. This date "touch" would need to be encapsulated
+        //perhaps in JPAEntityDescriptorServiceImpl#buildDescriptorFromRepresentation
+        ed.modifiedDate = LocalDateTime.now()
+
+        entityDescriptorHistory = updateAndGetRevisionHistoryOfEntityDescriptor(ed, representation, entityDescriptorService,
+                entityDescriptorRepository,
+                txMgr,
+                entityManager)
+
+        EntityAttributes attrs2 = entityDescriptorService.getEntityAttributes(getTargetEntityForRevisionIndex(entityDescriptorHistory, 1))
+
+        //Initial revision
+        attrs = entityDescriptorService.getEntityAttributes(getTargetEntityForRevisionIndex(entityDescriptorHistory, 0))
+
+        then:
+        entityDescriptorHistory.size() == 2
+        attrs2.attributes[0].attributeValues[0].xsStringvalue == 'attr1'
+        attrs2.attributes[0].attributeValues[1].xsStringvalue == 'attr2'
+
+        //Check the initial revision is intact
+        attrs.attributes[0].attributeValues[0].storedValue == 'true'
+        attrs.attributes[1].attributeValues[0].xsStringvalue == 'attr1'
+        attrs.attributes[1].attributeValues[1] == null
+    }
 }