Merge branch 'develop' into fixing-rest-keystore-types

Author: sfiorani

kura/distrib/src/main/resources/filtered/pkg/install/kura.service

@@ -1,7 +1,7 @@
 [Unit]
 Description=Kura
-Wants=dbus.service
-After=dbus.service
+Wants=dbus.service,docker.service
+After=dbus.service,docker.service
 
 [Service]
 User=kurad

kura/org.eclipse.kura.api/META-INF/MANIFEST.MF

@@ -47,7 +47,7 @@ Export-Package: org.eclipse.kura;version="1.7.0",
  org.eclipse.kura.driver.descriptor;version="1.0.0",
  org.eclipse.kura.executor;version="1.0.0",
  org.eclipse.kura.gpio;version="1.2.0",
- org.eclipse.kura.identity;version="1.1.0",
+ org.eclipse.kura.identity;version="1.2.0",
  org.eclipse.kura.identity.configuration.extension;version="1.0.0",
  org.eclipse.kura.linux.udev;version="1.0.1",
  org.eclipse.kura.log;version="1.1.0",

kura/org.eclipse.kura.api/src/main/java/org/eclipse/kura/identity/IdentityService.java

@@ -1,17 +1,20 @@
 /*******************************************************************************
- * Copyright (c) 2024 Eurotech and/or its affiliates and others
- * 
+ * Copyright (c) 2024, 2026 Eurotech and/or its affiliates and others
+ *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
  * which is available at https://www.eclipse.org/legal/epl-2.0/
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
- * 
+ *
  * Contributors:
  *  Eurotech
  ******************************************************************************/
+// Content with portions generated by generative AI platform
+
 package org.eclipse.kura.identity;
 
+import java.time.Duration;
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
@@ -31,76 +34,101 @@ public interface IdentityService {
     /**
      * Creates a new identity with the given name.
      * 
-     * @param identityName the name of the identity to be created.
+     * @param identityName
+     *            the name of the identity to be created.
      * @return {@code true} if the identity with the given name has been created as
      *         part of the method call or {@code false} if the identity already
-     *         exist.
-     * @throws KuraException if a failure occurs in creating the identity.
+     *         exists.
+     * @throws KuraException
+     *             if a failure occurs in creating the identity.
      */
     public boolean createIdentity(final String identityName) throws KuraException;
 
     /**
-     * Deletes the identity with the given name.
+     * Creates a new identity using the provided configuration.
      * 
-     * @param identityName the name of the identity to be deleted.
+     * @param identityConfiguration
+     *            the identity configuration including identity
+     *            name and optional configuration components.
+     * @return {@code true} if the identity with the given name has been created as
+     *         part of the method call or {@code false} if the identity already
+     *         exists.
+     * @throws KuraException
+     *             if a failure occurs in creating the identity.
+     * @since 2.8.0
+     */
+    public boolean createIdentity(final IdentityConfiguration identityConfiguration) throws KuraException;
+
+    /**
+     * Deletes the identity with the given name, including temporary identities.
+     * 
+     * @param identityName
+     *            the name of the identity to be deleted.
      * @return {@code true} if the identity with the given name has been deleted as
      *         part of the method call or {@code false} if the identity does not
      *         exist.
-     * @throws KuraException if a failure occurs in deleting the identity.
+     * @throws KuraException
+     *             if a failure occurs in deleting the identity.
      */
     public boolean deleteIdentity(final String identityName) throws KuraException;
 
     /**
      * Returns the configuration of all existing identities.
      * 
-     * @param componentsToReturn the set of {@link IdentityConfigurationComponent}
-     *                           types to be returned. If the set is empty a
-     *                           {@link IdentityConfiguration} will be returned for
-     *                           each defined identity with an empty component list.
-     *                           This can be used to get the name for all defined
-     *                           identities.
+     * @param componentsToReturn
+     *            the set of {@link IdentityConfigurationComponent}
+     *            types to be returned. If the set is empty a
+     *            {@link IdentityConfiguration} will be returned for
+     *            each defined identity with an empty component list.
+     *            This can be used to get the name for all defined
+     *            identities.
      * 
      * @return the list of {@link IdentityConfiguration}s. An empty list will be
      *         returned if no identities are defined.
-     * @throws KuraException if a failure occurs in retrieving identity
-     *                       configurations.
+     * @throws KuraException
+     *             if a failure occurs in retrieving identity
+     *             configurations.
      */
     public List<IdentityConfiguration> getIdentitiesConfiguration(
-            Set<Class<? extends IdentityConfigurationComponent>> componentsToReturn)
-            throws KuraException;
+            Set<Class<? extends IdentityConfigurationComponent>> componentsToReturn) throws KuraException;
 
     /**
      * Returns the configuration of the identity with the given name.
      * 
-     * @param identityName       the identity name.
-     * @param componentsToReturn the set of {@link IdentityConfigurationComponent}
-     *                           types to be returned.
+     * @param identityName
+     *            the identity name.
+     * @param componentsToReturn
+     *            the set of {@link IdentityConfigurationComponent}
+     *            types to be returned.
      * @return the configuration of the requested identity or an empty optional if
      *         the identity does not exist.
-     * @throws KuraException if a failure occurs in retrieving identity
-     *                       configuration.
+     * @throws KuraException
+     *             if a failure occurs in retrieving identity
+     *             configuration.
      */
     public Optional<IdentityConfiguration> getIdentityConfiguration(final String identityName,
-            Set<Class<? extends IdentityConfigurationComponent>> componentsToReturn)
-            throws KuraException;
+            Set<Class<? extends IdentityConfigurationComponent>> componentsToReturn) throws KuraException;
 
     /**
      * Returns the default configuration for the identity with the given name, this
      * method should succeed even if the identity does not exist. The result should
      * be the same configuration returned by the
-     * {@link IdentityService#getIdentityConfiguration(String, List)}
+     * {@link IdentityService#getIdentityConfiguration(String, Set)}
      * method for an identity that has just been created with the
      * {@link IdentityService#createIdentity(String)} method.
      * 
      * This method can be useful for example to allow a user interface to show the
      * initial identity configuration to the user before creating it.
      *
-     * @param identityName       the identity name.
-     * @param componentsToReturn the set of {@link IdentityConfigurationComponent}
-     *                           types to be returned.
+     * @param identityName
+     *            the identity name.
+     * @param componentsToReturn
+     *            the set of {@link IdentityConfigurationComponent}
+     *            types to be returned.
      * @return the default configuration for the requested identity
-     * @throws KuraException if a failure occurs in retrieving identity
-     *                       configuration.
+     * @throws KuraException
+     *             if a failure occurs in retrieving identity
+     *             configuration.
      */
     public IdentityConfiguration getIdentityDefaultConfiguration(final String identityName,
             Set<Class<? extends IdentityConfigurationComponent>> componentsToReturn) throws KuraException;
@@ -109,48 +137,54 @@ public IdentityConfiguration getIdentityDefaultConfiguration(final String identi
      * Validates the provided identity configuration without performing any
      * change to the system.
      * 
-     * @param identityConfiguration the identity configuration that should be
-     *                              validated.
-     * @throws KuraException if the provided identity configuration is not
-     *                       valid.
+     * @param identityConfiguration
+     *            the identity configuration that should be
+     *            validated.
+     * @throws KuraException
+     *             if the provided identity configuration is not
+     *             valid.
      */
-    public void validateIdentityConfiguration(final IdentityConfiguration identityConfiguration)
-            throws KuraException;
+    public void validateIdentityConfiguration(final IdentityConfiguration identityConfiguration) throws KuraException;
 
     /**
      * Updates the configuration of the given identity for the provided
      * {@link IdentityConfigurationComponent} types.
      * The configuration of the identities or identity
      * components that have not been provided will not be modified.
      * 
-     * @param identityConfiguration the identity configuration that should be
-     *                              updated.
-     * @throws KuraException if a failure occurs updating identity
-     *                       configuration.
+     * @param identityConfiguration
+     *            the identity configuration that should be
+     *            updated.
+     * @throws KuraException
+     *             if a failure occurs updating identity
+     *             configuration.
      */
-    public void updateIdentityConfiguration(final IdentityConfiguration identityConfiguration)
-            throws KuraException;
+    public void updateIdentityConfiguration(final IdentityConfiguration identityConfiguration) throws KuraException;
 
     /**
      * Defines a new permission.
      * 
-     * @param permission the permission to be created.
+     * @param permission
+     *            the permission to be created.
      * @return {@code true} if the permission has been created as
      *         part of the method call or {@code false} if the permission already
      *         exist.
-     * @throws KuraException if a failure occurs creating the permission.
+     * @throws KuraException
+     *             if a failure occurs creating the permission.
      */
     public boolean createPermission(final Permission permission) throws KuraException;
 
     /**
      * Removes an existing permission. The permission will also be removed from all
      * identities assigned to it.
      * 
-     * @param permission the permission to be deleted.
+     * @param permission
+     *            the permission to be deleted.
      * @return {@code true} if the permission has been deleted as
      *         part of the method call or {@code false} if the permission does not
      *         exist.
-     * @throws KuraException if a failure occurs deleting the permission.
+     * @throws KuraException
+     *             if a failure occurs deleting the permission.
      */
     public boolean deletePermission(final Permission permission) throws KuraException;
 
@@ -160,17 +194,20 @@ public void updateIdentityConfiguration(final IdentityConfiguration identityConf
      * 
      * @return the set of permissions that are currently defined within the
      *         framework.
-     * @throws KuraException if a failure occurs retrieving the permission set.
+     * @throws KuraException
+     *             if a failure occurs retrieving the permission set.
      */
     public Set<Permission> getPermissions() throws KuraException;
 
     /**
      * Computes a {@link PasswordHash} for the given plaintext password. The
      * password array will be overwritten at the end of the operation.
      * 
-     * @param password the plaintext password.
+     * @param password
+     *            the plaintext password.
      * @return the computed password hash.
-     * @throws KuraException if a failure occurs computing the password hash
+     * @throws KuraException
+     *             if a failure occurs computing the password hash
      */
     public PasswordHash computePasswordHash(final char[] password) throws KuraException;
 
@@ -180,22 +217,65 @@ public void updateIdentityConfiguration(final IdentityConfiguration identityConf
      * 
      * @param identityName
      * @param password
-     * @throws KuraException if the passwords do not match of if a failure occurs
-     *                       while
-     *                       performing the check.
+     * @throws KuraException
+     *             if the passwords do not match of if a failure occurs
+     *             while
+     *             performing the check.
      */
     public void checkPassword(final String identityName, final char[] password) throws KuraException;
 
     /**
      * Checks if the specified permission is currently assigned to the given
      * identity.
-     * 
+     *
      * @param identityName
      * @param permission
-     * @throws KuraException if the provided permissio is not currently assigned to
-     *                       the given identity or if occurs while performing the
-     *                       check.
-     * 
+     * @throws KuraException
+     *             if the provided permission is not currently assigned to
+     *             the given identity or if occurs while performing the
+     *             check.
+     *
      */
     public void checkPermission(final String identityName, final Permission permission) throws KuraException;
+
+    /**
+     * Creates a temporary identity that is not persisted and has automatic
+     * expiration. Temporary identities behave like regular identities but are
+     * stored in-memory only and are automatically removed after the specified
+     * lifetime period.
+     *
+     * @param identityName
+     *            the name of the temporary identity to create.
+     * @param lifetime
+     *            the duration before automatic expiration. The identity
+     *            will be automatically removed after this period.
+     * @throws KuraException
+     *             if a failure occurs in creating the temporary identity
+     *             or if an identity with the given name already exists
+     *             (either regular or temporary).
+     * @since 2.8.0
+     */
+    public void createTemporaryIdentity(final String identityName, final Duration lifetime) throws KuraException;
+
+
+    /**
+     * Creates a temporary identity that is not persisted and has automatic
+     * expiration. Temporary identities behave like regular identities but are
+     * stored in-memory only and are automatically removed after the specified
+     * lifetime period.
+     *
+     * @param identityConfiguration
+     *            the identity configuration including identity
+     *            name and optional configuration components.
+     * @param lifetime
+     *            the duration before automatic expiration. The identity
+     *            will be automatically removed after this period.
+     * @throws KuraException
+     *             if a failure occurs in creating the temporary identity,
+     *             if an identity with the given name already exists
+     *             (either regular or temporary) or if the provided configuration
+     *             is not valid.
+     * @since 2.8.0
+     */
+    public void createTemporaryIdentity(final IdentityConfiguration identityConfiguration, final Duration lifetime) throws KuraException;
 }

kura/org.eclipse.kura.container.orchestration.provider/src/main/java/org/eclipse/kura/container/orchestration/provider/impl/ContainerOrchestrationServiceImpl.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2022, 2025 Eurotech and/or its affiliates and others
+ * Copyright (c) 2022, 2026 Eurotech and/or its affiliates and others
  *
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
@@ -10,6 +10,7 @@
  * Contributors:
  *  Eurotech
  *******************************************************************************/
+// Content with portions generated by generative AI platform
 package org.eclipse.kura.container.orchestration.provider.impl;
 
 import static java.util.Objects.isNull;
@@ -52,6 +53,7 @@
 import com.github.dockerjava.api.command.InspectImageResponse;
 import com.github.dockerjava.api.command.PullImageCmd;
 import com.github.dockerjava.api.command.PullImageResultCallback;
+import com.github.dockerjava.api.exception.NotModifiedException;
 import com.github.dockerjava.api.model.AuthConfig;
 import com.github.dockerjava.api.model.Bind;
 import com.github.dockerjava.api.model.Container;
@@ -401,6 +403,8 @@ public void stopContainer(String id) throws KuraException {
                 this.dockerClient.stopContainerCmd(id).exec();
             }
 
+        } catch (NotModifiedException e) {
+            logger.debug("Container {} already stopped", id);
         } catch (Exception e) {
             logger.error("Could not stop container {}. Caused by {}", id, e);
             throw new KuraException(KuraErrorCode.OS_COMMAND_ERROR);

kura/org.eclipse.kura.container.provider/META-INF/MANIFEST.MF

@@ -11,6 +11,8 @@ Import-Package: org.eclipse.kura;version="[1.3,2.0)",
  org.eclipse.kura.container.orchestration.listener;version="[1.0,1.1)",
  org.eclipse.kura.container.signature;version="[1.0,2.0)",
  org.eclipse.kura.crypto;version="[1.3,2.0)",
+ org.eclipse.kura.identity;version="[1.2,2.0)",
+ org.eclipse.kura.net;version="[2.0,3.0)",
  org.eclipse.kura.util.configuration;version="[1.0,2.0)",
  org.osgi.service.component;version="1.4.0",
  org.slf4j;version="1.7.25"