Merged in SHIBUI-479 (pull request #71)

SHIBUI-479

Approved-by: Shibui Jenkins <shibui.jenkins@gmail.com>

backend/build.gradle

@@ -5,6 +5,7 @@ plugins {
     id 'org.springframework.boot' version '2.0.0.RELEASE'
     id 'com.gorylenko.gradle-git-properties' version '1.4.21'
     id 'net.researchgate.release' version '2.6.0'
+    id 'io.franzbecker.gradle-lombok' version '1.13'
 }
 
 apply plugin: 'io.spring.dependency-management'
@@ -20,6 +21,12 @@ repositories {
     }
 }
 
+configurations.all {
+    resolutionStrategy {
+        force 'org.cryptacular:cryptacular:1.1.3'
+    }
+}
+
 processResources.dependsOn(':ui:npm_run_buildProd')
 
 //Integration of the frontend and backend into the build to have all of the UI resources available in the app's executable war
@@ -41,6 +48,11 @@ springBoot {
     buildInfo()
 }
 
+lombok {
+    version = "1.16.20"
+    sha256 = "c5178b18caaa1a15e17b99ba5e4023d2de2ebc18b58cde0f5a04ca4b31c10e6d"
+}
+
 dependencies {
     // opensaml deps
     ['opensaml-saml-api', 'opensaml-saml-impl', 'opensaml-xmlsec-api', 'opensaml-xmlsec-impl'].each {
@@ -174,4 +186,4 @@ tasks.withType(JavaExec) {
 
 compileJava {
     dependsOn generateSources
-}
+}

backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/EntityDescriptorController.java

@@ -96,6 +96,12 @@ public ResponseEntity<?> update(@RequestBody EntityDescriptorRepresentation edRe
         if (existingEd == null) {
             return ResponseEntity.notFound().build();
         }
+
+        // Verify we're the only one attempting to update the EntityDescriptor
+        if (edRepresentation.getVersion() != existingEd.hashCode()) {
+            return new ResponseEntity<Void>(HttpStatus.CONFLICT);
+        }
+
         EntityDescriptor updatedEd =
                 EntityDescriptor.class.cast(entityDescriptorService.createDescriptorFromRepresentation(edRepresentation));
 

backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/FilterController.java

@@ -10,6 +10,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
@@ -98,6 +99,12 @@ public ResponseEntity<?> update(@PathVariable String metadataResolverId, @Reques
         }
 
         EntityAttributesFilter eaf = filters.get(0);
+
+        // Verify we're the only one attempting to update the filter
+        if (filterRepresentation.getVersion() != eaf.hashCode()) {
+            return new ResponseEntity<Void>(HttpStatus.CONFLICT);
+        }
+
         // convert our representation so we can get the attributes more easily...
         EntityAttributesFilter updatedFilter = filterService.createFilterFromRepresentation(filterRepresentation);
         eaf.setName(updatedFilter.getName());

backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AbstractAuditable.java

@@ -8,15 +8,14 @@
 import org.springframework.data.annotation.LastModifiedDate;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
-import java.time.LocalDateTime;
-
 import javax.persistence.Column;
 import javax.persistence.EntityListeners;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.MappedSuperclass;
 import javax.validation.constraints.NotNull;
+import java.time.LocalDateTime;
 
 
 @MappedSuperclass

backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AdditionalMetadataLocation.java

@@ -1,9 +1,12 @@
 package edu.internet2.tier.shibboleth.admin.ui.domain;
 
+import lombok.EqualsAndHashCode;
+
 import javax.persistence.Entity;
 
 
 @Entity
+@EqualsAndHashCode(callSuper = true)
 public class AdditionalMetadataLocation extends AbstractXMLObject implements org.opensaml.saml.saml2.metadata.AdditionalMetadataLocation {
 
     private String locationURI;

backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AffiliateMember.java

@@ -1,9 +1,12 @@
 package edu.internet2.tier.shibboleth.admin.ui.domain;
 
+import lombok.EqualsAndHashCode;
+
 import javax.persistence.Entity;
 
 
 @Entity
+@EqualsAndHashCode(callSuper = true)
 public class AffiliateMember extends AbstractXMLObject implements org.opensaml.saml.saml2.metadata.AffiliateMember {
 
     private String localId;

backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AffiliationDescriptor.java

@@ -1,6 +1,7 @@
 package edu.internet2.tier.shibboleth.admin.ui.domain;
 
 import com.google.common.collect.Lists;
+import lombok.EqualsAndHashCode;
 
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
@@ -10,6 +11,7 @@
 
 
 @Entity
+@EqualsAndHashCode(callSuper = true)
 public class AffiliationDescriptor extends AbstractDescriptor implements org.opensaml.saml.saml2.metadata.AffiliationDescriptor {
 
     private String ownerId;

backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/ArtifactResolutionService.java

@@ -1,8 +1,11 @@
 package edu.internet2.tier.shibboleth.admin.ui.domain;
 
+import lombok.EqualsAndHashCode;
+
 import javax.persistence.Entity;
 
 
 @Entity
+@EqualsAndHashCode(callSuper = true)
 public class ArtifactResolutionService extends IndexedEndpoint implements org.opensaml.saml.saml2.metadata.ArtifactResolutionService {
 }

backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AssertionConsumerService.java

@@ -1,8 +1,11 @@
 package edu.internet2.tier.shibboleth.admin.ui.domain;
 
+import lombok.EqualsAndHashCode;
+
 import javax.persistence.Entity;
 
 
 @Entity
+@EqualsAndHashCode(callSuper = true)
 public class AssertionConsumerService extends IndexedEndpoint implements org.opensaml.saml.saml2.metadata.AssertionConsumerService {
 }

backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AssertionIDRequestService.java

@@ -1,8 +1,11 @@
 package edu.internet2.tier.shibboleth.admin.ui.domain;
 
+import lombok.EqualsAndHashCode;
+
 import javax.persistence.Entity;
 
 
 @Entity
+@EqualsAndHashCode(callSuper = true)
 public class AssertionIDRequestService extends Endpoint implements org.opensaml.saml.saml2.metadata.AssertionIDRequestService {
 }

backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/Attribute.java

@@ -1,5 +1,6 @@
 package edu.internet2.tier.shibboleth.admin.ui.domain;
 
+import lombok.EqualsAndHashCode;
 import org.opensaml.core.xml.XMLObject;
 
 import javax.annotation.Nullable;
@@ -12,6 +13,7 @@
 
 
 @Entity
+@EqualsAndHashCode(callSuper = true)
 public class Attribute extends AbstractAttributeExtensibleXMLObject implements org.opensaml.saml.saml2.core.Attribute {
 
     private String name;

backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AttributeAuthorityDescriptor.java

@@ -1,6 +1,6 @@
 package edu.internet2.tier.shibboleth.admin.ui.domain;
 
-import com.google.common.collect.Lists;
+import lombok.EqualsAndHashCode;
 
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
@@ -11,6 +11,7 @@
 
 
 @Entity
+@EqualsAndHashCode(callSuper = true)
 public class AttributeAuthorityDescriptor extends RoleDescriptor implements org.opensaml.saml.saml2.metadata.AttributeAuthorityDescriptor {
 
     @OneToMany(cascade = CascadeType.ALL)

backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AttributeConsumingService.java

@@ -1,5 +1,6 @@
 package edu.internet2.tier.shibboleth.admin.ui.domain;
 
+import lombok.EqualsAndHashCode;
 import org.opensaml.core.xml.schema.XSBooleanValue;
 
 import javax.persistence.CascadeType;
@@ -11,6 +12,7 @@
 
 
 @Entity
+@EqualsAndHashCode(callSuper = true)
 public class AttributeConsumingService extends AbstractXMLObject implements org.opensaml.saml.saml2.metadata.AttributeConsumingService {
 
     private int acsIndex;

backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AttributeProfile.java

@@ -1,9 +1,12 @@
 package edu.internet2.tier.shibboleth.admin.ui.domain;
 
+import lombok.EqualsAndHashCode;
+
 import javax.persistence.Entity;
 
 
 @Entity
+@EqualsAndHashCode(callSuper = true)
 public class AttributeProfile extends AbstractXMLObject implements org.opensaml.saml.saml2.metadata.AttributeProfile {
 
     private String profileURI;

backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AttributeService.java

@@ -1,8 +1,11 @@
 package edu.internet2.tier.shibboleth.admin.ui.domain;
 
+import lombok.EqualsAndHashCode;
+
 import javax.persistence.Entity;
 
 @Entity
+@EqualsAndHashCode(callSuper = true)
 public class AttributeService extends Endpoint implements org.opensaml.saml.saml2.metadata.AttributeService {
 
 }

backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AttributeValue.java

@@ -1,7 +1,10 @@
 package edu.internet2.tier.shibboleth.admin.ui.domain;
 
+import lombok.EqualsAndHashCode;
+
 import javax.persistence.Entity;
 
 @Entity
+@EqualsAndHashCode(callSuper = true)
 public class AttributeValue extends AbstractXMLObject implements org.opensaml.saml.saml2.core.AttributeValue {
 }

backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AuthnAuthorityDescriptor.java

@@ -1,6 +1,7 @@
 package edu.internet2.tier.shibboleth.admin.ui.domain;
 
 import com.google.common.collect.Lists;
+import lombok.EqualsAndHashCode;
 
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
@@ -10,6 +11,7 @@
 
 
 @Entity
+@EqualsAndHashCode(callSuper = true)
 public class AuthnAuthorityDescriptor extends RoleDescriptor implements org.opensaml.saml.saml2.metadata.AuthnAuthorityDescriptor {
 
     @OneToMany(cascade = CascadeType.ALL)

backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AuthnQueryService.java

@@ -1,8 +1,11 @@
 package edu.internet2.tier.shibboleth.admin.ui.domain;
 
+import lombok.EqualsAndHashCode;
+
 import javax.persistence.Entity;
 
 
 @Entity
+@EqualsAndHashCode(callSuper = true)
 public class AuthnQueryService extends Endpoint implements org.opensaml.saml.saml2.metadata.AuthnQueryService {
 }

backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AuthzService.java

@@ -1,8 +1,11 @@
 package edu.internet2.tier.shibboleth.admin.ui.domain;
 
+import lombok.EqualsAndHashCode;
+
 import javax.persistence.Entity;
 
 
 @Entity
+@EqualsAndHashCode(callSuper = true)
 public class AuthzService extends Endpoint implements org.opensaml.saml.saml2.metadata.AuthzService {
 }

backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/Company.java

@@ -1,9 +1,12 @@
 package edu.internet2.tier.shibboleth.admin.ui.domain;
 
+import lombok.EqualsAndHashCode;
+
 import javax.persistence.Entity;
 
 
 @Entity
+@EqualsAndHashCode(callSuper = true)
 public class Company extends AbstractXMLObject implements org.opensaml.saml.saml2.metadata.Company {
 
     private String name;

backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/ContactPerson.java

@@ -1,5 +1,6 @@
 package edu.internet2.tier.shibboleth.admin.ui.domain;
 
+import lombok.EqualsAndHashCode;
 import org.opensaml.core.xml.XMLObject;
 import org.opensaml.saml.saml2.metadata.ContactPersonTypeEnumeration;
 
@@ -10,6 +11,7 @@
 
 
 @Entity
+@EqualsAndHashCode(callSuper = true)
 public class ContactPerson extends AbstractAttributeExtensibleXMLObject implements org.opensaml.saml.saml2.metadata.ContactPerson {
 
     private String contactPersonType;

backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/Description.java

@@ -1,10 +1,13 @@
 package edu.internet2.tier.shibboleth.admin.ui.domain;
 
+import lombok.EqualsAndHashCode;
+
 import javax.annotation.Nullable;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 
 @Entity
+@EqualsAndHashCode(callSuper = true)
 public class Description extends AbstractXMLObject implements org.opensaml.saml.ext.saml2mdui.Description {
 
     @Column(name = "descriptionXMLLang")

backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/DisplayName.java

@@ -1,10 +1,13 @@
 package edu.internet2.tier.shibboleth.admin.ui.domain;
 
+import lombok.EqualsAndHashCode;
+
 import javax.annotation.Nullable;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 
 @Entity
+@EqualsAndHashCode(callSuper = true)
 public class DisplayName extends AbstractXMLObject implements org.opensaml.saml.ext.saml2mdui.DisplayName {
 
     @Column(name = "displayNameXMLLan")

backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/EmailAddress.java

@@ -1,8 +1,11 @@
 package edu.internet2.tier.shibboleth.admin.ui.domain;
 
+import lombok.EqualsAndHashCode;
+
 import javax.persistence.Entity;
 
 @Entity
+@EqualsAndHashCode(callSuper = true)
 public class EmailAddress extends AbstractXMLObject implements org.opensaml.saml.saml2.metadata.EmailAddress {
 
     private String address;

backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/EncryptionMethod.java

@@ -1,5 +1,6 @@
 package edu.internet2.tier.shibboleth.admin.ui.domain;
 
+import lombok.EqualsAndHashCode;
 import org.opensaml.xmlsec.encryption.KeySize;
 import org.opensaml.xmlsec.encryption.OAEPparams;
 
@@ -8,6 +9,7 @@
 import javax.persistence.Entity;
 
 @Entity
+@EqualsAndHashCode(callSuper = true)
 public class EncryptionMethod extends AbstractElementExtensibleXMLObject implements org.opensaml.saml.saml2.metadata.EncryptionMethod {
 
     private String algorithm;

backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/Endpoint.java

@@ -1,5 +1,6 @@
 package edu.internet2.tier.shibboleth.admin.ui.domain;
 
+import lombok.EqualsAndHashCode;
 import org.opensaml.core.xml.XMLObject;
 
 import javax.annotation.Nonnull;
@@ -12,6 +13,7 @@
  * Note: This also should extend AbstractElementExtensibleXMLObject, but we can't in Java.
  */
 @Entity
+@EqualsAndHashCode(callSuper = true)
 public class Endpoint extends AbstractAttributeExtensibleXMLObject implements org.opensaml.saml.saml2.metadata.Endpoint {
 
     private String binding;