Merge pull request #8559 from mandy-chessell/oak2024

Create element metadata security
odpi · Jan 3, 2025 · fd1f3a1 · fd1f3a1
2 parents e8308ec + 19177ef
commit fd1f3a1
Show file tree

Hide file tree

Showing 344 changed files with 18,213 additions and 23,389 deletions.
diff --git a/EgeriaContentPacksGUIDMap.json b/EgeriaContentPacksGUIDMap.json
diff --git a/application.properties b/application.properties
@@ -24,10 +24,10 @@ platform.configstore.endpoint=data/servers/{0}/config/{0}.config
 ### By default, there is no platform metadata security connector.
 ### The values below are for a sample platform metadata security connector based off of Coco Pharmaceutical persona
 ###############################################
-platform.security.provider=org.odpi.openmetadata.metadatasecurity.samples.CocoPharmaSecretsSecurityProvider
+platform.security.provider=org.odpi.openmetadata.metadatasecurity.accessconnector.OpenMetadataAccessSecurityProvider
 platform.security.name=Coco Pharmaceuticals Platform
 platform.security.secrets.provider=org.odpi.openmetadata.adapters.connectors.secretsstore.yaml.YAMLSecretsStoreProvider
-platform.security.secrets.location=loading-bay/secrets/demo-user-directory.omsecrets
+platform.security.secrets.location=loading-bay/secrets/coco-user-directory.omsecrets
 platform.security.secrets.collection=userDirectory
 
 ###############################################
@@ -65,14 +65,16 @@ platform.placeholder.variables=\
     "egeriaEndpoint" : "https://localhost:9443",\
     "postgreSQLDatabaseURL" : "jdbc:postgresql://localhost:5432/egeria",\
     "secretsStore" : "loading-bay/secrets/default.omsecrets",\
-    "postgreSQLServerCollectionName" : "PostgreSQL Server:LocalPostgreSQL1"\
+    "postgreSQLServerCollectionName" : "PostgreSQL Server:LocalPostgreSQL1",\
+    "metadataAccessSecretsStore" : "loading-bay/secrets/coco-user-directory.omsecrets",\
+    "metadataAccessCollectionName" : "userDirectory"\
   }
 
 ################################################
 ### startup servers configuration
 ################################################
 #userId used to start up the list of configured servers default is 'system'
-startup.user=system
+startup.user=platform
 # Comma separated names of servers to be started.  The server names should be unquoted.
 startup.server.list=active-metadata-store,engine-host,integration-daemon,view-server,simple-metadata-store
 

diff --git a/container.application.properties b/container.application.properties
@@ -24,10 +24,10 @@ platform.configstore.endpoint=data/servers/{0}/config/{0}.config
 ### By default, there is no platform metadata security connector.
 ### The values below are for a sample platform metadata security connector based off of Coco Pharmaceutical persona
 ###############################################
-platform.security.provider=org.odpi.openmetadata.metadatasecurity.samples.CocoPharmaSecretsSecurityProvider
+platform.security.provider=org.odpi.openmetadata.metadatasecurity.accessconnector.OpenMetadataAccessSecurityProvider
 platform.security.name=Coco Pharmaceuticals Platform
 platform.security.secrets.provider=org.odpi.openmetadata.adapters.connectors.secretsstore.yaml.YAMLSecretsStoreProvider
-platform.security.secrets.location=loading-bay/secrets/demo-user-directory.omsecrets
+platform.security.secrets.location=loading-bay/secrets/coco-user-directory.omsecrets
 platform.security.secrets.collection=userDirectory
 
 ###############################################
@@ -66,13 +66,15 @@ platform.placeholder.variables=\
     "postgreSQLDatabaseURL" : "jdbc:postgresql://host.docker.internal:5442/egeria",\
     "secretsStore" : "loading-bay/secrets/default.omsecrets",\
     "postgreSQLServerCollectionName" : "PostgreSQL Server:LocalPostgreSQL1"\
+    "metadataAccessSecretsStore" : "loading-bay/secrets/coco-user-directory.omsecrets",\
+    "metadataAccessCollectionName" : "userDirectory"\
   }
 
 ################################################
 ### startup servers configuration
 ################################################
 #userId used to start up the list of configured servers default is 'system'
-startup.user=system
+startup.user=platform
 # Comma separated names of servers to be started.  The server names should be unquoted.
 startup.server.list=active-metadata-store,engine-host,integration-daemon,view-server,simple-metadata-store
 

diff --git a/content-packs/APIsContentPack.omarchive b/content-packs/APIsContentPack.omarchive
diff --git a/content-packs/ApacheAtlasContentPack.omarchive b/content-packs/ApacheAtlasContentPack.omarchive
diff --git a/content-packs/ApacheKafkaContentPack.omarchive b/content-packs/ApacheKafkaContentPack.omarchive
diff --git a/content-packs/CocoBusinessSystemsArchive.omarchive b/content-packs/CocoBusinessSystemsArchive.omarchive
diff --git a/content-packs/CocoClinicalTrialsTemplatesArchive.omarchive b/content-packs/CocoClinicalTrialsTemplatesArchive.omarchive
diff --git a/content-packs/CocoComboArchive.omarchive b/content-packs/CocoComboArchive.omarchive
diff --git a/content-packs/CocoGovernanceEngineDefinitionsArchive.omarchive b/content-packs/CocoGovernanceEngineDefinitionsArchive.omarchive
diff --git a/content-packs/CocoGovernanceProgramArchive.omarchive b/content-packs/CocoGovernanceProgramArchive.omarchive
diff --git a/content-packs/CocoOrganizationArchive.omarchive b/content-packs/CocoOrganizationArchive.omarchive
diff --git a/content-packs/CocoSustainabilityArchive.omarchive b/content-packs/CocoSustainabilityArchive.omarchive
diff --git a/content-packs/CocoTypesArchive.omarchive b/content-packs/CocoTypesArchive.omarchive
diff --git a/content-packs/CoreContentPack.omarchive b/content-packs/CoreContentPack.omarchive
diff --git a/content-packs/ObservabilityContentPack.omarchive b/content-packs/ObservabilityContentPack.omarchive
diff --git a/content-packs/OpenMetadataTypes.omarchive b/content-packs/OpenMetadataTypes.omarchive
diff --git a/content-packs/PostgresContentPack.omarchive b/content-packs/PostgresContentPack.omarchive
diff --git a/content-packs/UnityCatalogContentPack.omarchive b/content-packs/UnityCatalogContentPack.omarchive
diff --git a/open-metadata-distribution/omag-server-platform/build.gradle b/open-metadata-distribution/omag-server-platform/build.gradle
@@ -36,6 +36,7 @@ dependencies {
     implementation project(':open-metadata-implementation:adapters:open-connectors:data-store-connectors:jdbc-resource-connector')
     implementation project(':open-metadata-implementation:adapters:open-connectors:configuration-store-connectors:configuration-encrypted-file-store-connector')
     implementation project(':open-metadata-implementation:adapters:open-connectors:configuration-store-connectors:configuration-file-store-connector')
+    implementation project(':open-metadata-implementation:adapters:open-connectors:metadata-security-connectors:open-metadata-access-security-connector')
     implementation project(':open-metadata-implementation:adapters:open-connectors:integration-connectors:files-integration-connectors')
     implementation project(':open-metadata-implementation:adapters:open-connectors:integration-connectors:kafka-audit-integration-connector')
     implementation project(':open-metadata-implementation:adapters:open-connectors:integration-connectors:jdbc-integration-connector')
@@ -92,7 +93,6 @@ dependencies {
     implementation project(':open-metadata-resources:open-metadata-archives:open-metadata-types-utility')
     implementation project(':open-metadata-resources:open-metadata-archives:core-content-pack')
     implementation project(':open-metadata-resources:open-metadata-samples:sample-metadata:big-glossaries')
-    implementation project(':open-metadata-resources:open-metadata-samples:open-metadata-security-samples')
     implementation project(':open-metadata-resources:open-metadata-samples:governance-action-samples')
     implementation project(':open-metadata-resources:open-metadata-samples:access-services-samples:asset-management-samples:asset-create-avro-sample')
     implementation project(':open-metadata-resources:open-metadata-samples:access-services-samples:asset-management-samples:asset-create-csv-sample')
@@ -217,6 +217,7 @@ distributions {
                 from { project(':open-metadata-implementation:adapters:open-connectors:governance-action-connectors').jar }
                 from { project(':open-metadata-implementation:adapters:open-connectors:nanny-connectors').jar }
                 from { project(':open-metadata-implementation:adapters:open-connectors:report-generating-connectors').jar }
+                from { project(':open-metadata-implementation:adapters:open-connectors:metadata-security-connectors:open-metadata-access-security-connector').jar }
                 from { project(':open-metadata-implementation:adapters:open-connectors:integration-connectors:files-integration-connectors').jar }
                 from { project(':open-metadata-implementation:adapters:open-connectors:integration-connectors:csv-lineage-import-integration-connector').jar }
                 from { project(':open-metadata-implementation:adapters:open-connectors:integration-connectors:kafka-audit-integration-connector').jar }
@@ -225,7 +226,6 @@ distributions {
                 from { project(':open-metadata-implementation:adapters:open-connectors:integration-connectors:openlineage-integration-connectors').jar }
                 from { project(':open-metadata-implementation:adapters:open-connectors:event-bus-connectors:open-metadata-topic-connectors:inmemory-open-metadata-topic-connector').jar }
                 from { project(':open-metadata-implementation:adapters:open-connectors:event-bus-connectors:open-metadata-topic-connectors:kafka-open-metadata-topic-connector').jar }
-                from { project(':open-metadata-resources:open-metadata-samples:open-metadata-security-samples').jar }
                 from { project(':open-metadata-resources:open-metadata-samples:governance-action-samples').jar }
                 from { project(':open-metadata-implementation:adapters:open-connectors:rest-client-connectors:spring-rest-client-connector').jar }
                 from { project(':open-metadata-implementation:adapters:open-connectors:secrets-store-connectors:env-variable-secrets-store-connector').jar }

diff --git a/...pi/openmetadata/accessservices/assetconsumer/outtopic/AssetConsumerOMRSTopicListener.java b/...pi/openmetadata/accessservices/assetconsumer/outtopic/AssetConsumerOMRSTopicListener.java
@@ -734,17 +734,17 @@ private EntityDetail entityOfInterest(String       userId,
                 {
                     fullEntity = entity;
 
-                    assetHandler.validateAnchorForEntity(userId,
-                                                         fullEntity.getType().getTypeDefName(),
-                                                         fullEntity,
-                                                         guidParameterName,
-                                                         false,
-                                                         false,
-                                                         true,
-                                                         false,
-                                                         supportedZones,
-                                                         effectiveTime,
-                                                         methodName);
+                    assetHandler.validateEntityAndAnchorForRead(userId,
+                                                                fullEntity.getType().getTypeDefName(),
+                                                                fullEntity,
+                                                                guidParameterName,
+                                                                false,
+                                                                false,
+                                                                true,
+                                                                false,
+                                                                supportedZones,
+                                                                effectiveTime,
+                                                                methodName);
                 }
             }
             else if (entityProxy != null)

diff --git a/.../org/odpi/openmetadata/accessservices/assetconsumer/server/AssetConsumerRESTServices.java b/.../org/odpi/openmetadata/accessservices/assetconsumer/server/AssetConsumerRESTServices.java
@@ -2196,17 +2196,17 @@ public GUIDListResponse getAssetsByMeaning(String serverName,
                     }
                     else
                     {
-                        EntityDetail anchorEntity = handler.validateAnchorForEntity(userId,
-                                                                                    OpenMetadataType.OPEN_METADATA_ROOT.typeName,
-                                                                                    entity,
-                                                                                    entityGUIDParameterName,
-                                                                                    false,
-                                                                                    false,
-                                                                                    false,
-                                                                                    false,
-                                                                                    handler.getSupportedZones(),
-                                                                                    new Date(),
-                                                                                    methodName);
+                        EntityDetail anchorEntity = handler.validateEntityAndAnchorForRead(userId,
+                                                                                           OpenMetadataType.OPEN_METADATA_ROOT.typeName,
+                                                                                           entity,
+                                                                                           entityGUIDParameterName,
+                                                                                           false,
+                                                                                           false,
+                                                                                           false,
+                                                                                           false,
+                                                                                           handler.getSupportedZones(),
+                                                                                           new Date(),
+                                                                                           methodName);
                         if ((anchorEntity != null) && (repositoryHelper.isTypeOf(serverName, anchorEntity.getType().getTypeDefName(), OpenMetadataType.ASSET.typeName)))
                         {
                             if (! guids.contains(anchorEntity.getGUID()))

diff --git a/...i/openmetadata/accessservices/assetmanager/client/exchange/StewardshipExchangeClient.java b/...i/openmetadata/accessservices/assetmanager/client/exchange/StewardshipExchangeClient.java
@@ -685,7 +685,7 @@ public void setConfidentialityClassification(String
      * @param userId calling user
      * @param assetManagerGUID unique identifier of software capability representing the caller
      * @param assetManagerName unique name of software capability representing the caller
-     * @param elementGUID unique identifier of the metadata element to unclassify
+     * @param elementGUID unique identifier of the metadata element to declassify
      * @param externalIdentifier unique identifier of the element in the external asset manager
      * @param effectiveTime the time that the retrieved elements must be effective for
      * @param forLineage return elements marked with the Memento classification?
@@ -851,7 +851,7 @@ public void setRetentionClassification(String                            userId,
      * @param userId calling user
      * @param assetManagerGUID unique identifier of software capability representing the caller
      * @param assetManagerName unique name of software capability representing the caller
-     * @param elementGUID unique identifier of the metadata element to unclassify
+     * @param elementGUID unique identifier of the metadata element to declassify
      * @param externalIdentifier unique identifier of the element in the external asset manager
      * @param effectiveTime the time that the retrieved elements must be effective for
      * @param forLineage return elements marked with the Memento classification?

diff --git a/.../org/odpi/openmetadata/accessservices/assetmanager/handlers/DataAssetExchangeHandler.java b/.../org/odpi/openmetadata/accessservices/assetmanager/handlers/DataAssetExchangeHandler.java
@@ -1137,6 +1137,7 @@ public void clearAssetRelationship(String  userId,
                                         relationshipTypeName,
                                         forLineage,
                                         forDuplicateProcessing,
+                                        assetHandler.getSupportedZones(),
                                         effectiveTime,
                                         methodName);
     }

diff --git a/...va/org/odpi/openmetadata/accessservices/assetmanager/handlers/ProcessExchangeHandler.java b/...va/org/odpi/openmetadata/accessservices/assetmanager/handlers/ProcessExchangeHandler.java
@@ -212,7 +212,7 @@ private void addCorrelationPropertiesToPorts(String            userId,
                     element.setCorrelationHeaders(this.getCorrelationProperties(userId,
                                                                                 element.getElementHeader().getGUID(),
                                                                                 portGUIDParameterName,
-                                                                                OpenMetadataType.PORT_TYPE_NAME,
+                                                                                OpenMetadataType.PORT.typeName,
                                                                                 assetManagerGUID,
                                                                                 assetManagerName,
                                                                                 forLineage,
@@ -1274,18 +1274,18 @@ public String createPort(String                        userId,
         invalidParameterHandler.validateObject(portProperties, propertiesParameterName, methodName);
         invalidParameterHandler.validateName(portProperties.getQualifiedName(), qualifiedNameParameterName, methodName);
 
-        String typeName = OpenMetadataType.PORT_TYPE_NAME;
+        String typeName = OpenMetadataType.PORT.typeName;
 
         if (portProperties.getTypeName() != null)
         {
             typeName = portProperties.getTypeName();
         }
 
-        int portType = PortType.OTHER.getOpenTypeOrdinal();
+        int portType = PortType.OTHER.getOrdinal();
 
         if (portProperties.getPortType() != null)
         {
-            portType = portProperties.getPortType().getOpenTypeOrdinal();
+            portType = portProperties.getPortType().getOrdinal();
         }
 
         String portGUID = processHandler.createPort(userId,
@@ -1309,7 +1309,7 @@ public String createPort(String                        userId,
             this.createExternalIdentifier(userId,
                                           portGUID,
                                           portGUIDParameterName,
-                                          OpenMetadataType.PORT_TYPE_NAME,
+                                          OpenMetadataType.PORT.typeName,
                                           correlationProperties,
                                           forLineage,
                                           forDuplicateProcessing,
@@ -1358,7 +1358,7 @@ public void updatePort(String                        userId,
         invalidParameterHandler.validateObject(portProperties, propertiesParameterName, methodName);
         invalidParameterHandler.validateName(portProperties.getQualifiedName(), qualifiedNameParameterName, methodName);
 
-        String typeName = OpenMetadataType.PORT_TYPE_NAME;
+        String typeName = OpenMetadataType.PORT.typeName;
 
         if (portProperties.getTypeName() != null)
         {
@@ -1375,11 +1375,11 @@ public void updatePort(String                        userId,
                                         effectiveTime,
                                         methodName);
 
-        int portType = PortType.OTHER.getOpenTypeOrdinal();
+        int portType = PortType.OTHER.getOrdinal();
 
         if (portProperties.getPortType() != null)
         {
-            portType = portProperties.getPortType().getOpenTypeOrdinal();
+            portType = portProperties.getPortType().getOrdinal();
         }
 
         processHandler.updatePort(userId,
@@ -1752,7 +1752,7 @@ public void removePort(String                        userId,
         this.validateExternalIdentifier(userId,
                                         portGUID,
                                         portGUIDParameterName,
-                                        OpenMetadataType.PORT_TYPE_NAME,
+                                        OpenMetadataType.PORT.typeName,
                                         correlationProperties,
                                         forLineage,
                                         forDuplicateProcessing,
@@ -1982,7 +1982,7 @@ public PortElement getPortDelegation(String  userId,
             element.setCorrelationHeaders(this.getCorrelationProperties(userId,
                                                                         element.getElementHeader().getGUID(),
                                                                         portGUIDParameterName,
-                                                                        OpenMetadataType.PORT_TYPE_NAME,
+                                                                        OpenMetadataType.PORT.typeName,
                                                                         assetManagerGUID,
                                                                         assetManagerName,
                                                                         forLineage,
@@ -2096,7 +2096,7 @@ public PortElement getPortByGUID(String  userId,
             element.setCorrelationHeaders(this.getCorrelationProperties(userId,
                                                                         element.getElementHeader().getGUID(),
                                                                         portGUIDParameterName,
-                                                                        OpenMetadataType.PORT_TYPE_NAME,
+                                                                        OpenMetadataType.PORT.typeName,
                                                                         assetManagerGUID,
                                                                         assetManagerName,
                                                                         forLineage,