Merge branch 'master' into Reduce_Duplicate_Code

Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/HawkbitCommonUtil.java


Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>

README.md

@@ -14,6 +14,11 @@ see [hawkBit Wiki](https://github.com/eclipse/hawkbit/wiki)
 * Having issues with hawkBit? Open a [GitHub issue](https://github.com/eclipse/hawkbit/issues).
 * You can also check out our [Project Homepage](https://projects.eclipse.org/projects/iot.hawkbit) for further contact options.
 
+# hawkBit sandbox
+
+We offer a sandbox installation that is free for everyone to try out hawkBit. However, keep in mind that the sandbox database will be reset from time to time. It is also not possible to upload any artifacts into the sandbox. But you can use it to try out the Management UI, Management API and DDI API.
+
+https://hawkbit.eu-gb.mybluemix.net/UI/
 
 # Compile, Run and Getting Started
 

deployHawkBitSandbox.sh

@@ -0,0 +1,20 @@
+#
+# Copyright (c) 2015 Bosch Software Innovations GmbH and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+
+# This script allows the deployment of the complete hawkBit sandbox including
+# data example to a cloud foundry enviroment. Expects existing CF CLI
+# installation and login to be existing already.
+
+cd examples/hawkbit-example-app/target/
+cf push
+cd ../..
+java -jar hawkbit-mgmt-api-client/target/hawkbit-mgmt-api-client-0.2.0-SNAPSHOT.jar --hawkbit.url=hawkbit.eu-gb.mybluemix.net
+cd hawkbit-device-simulator/target/
+cf push
+cd ../../..

examples/hawkbit-device-simulator/README.md

@@ -2,7 +2,7 @@
 
 The device simulator handles software update commands from the update server.
 
-## Run
+## Run on your own workstation
 ```
 java -jar examples/hawkbit-device-simulator/target/hawkbit-device-simulator-*-SNAPSHOT.jar
 ```
@@ -11,6 +11,11 @@ Or:
 run org.eclipse.hawkbit.simulator.DeviceSimulator
 ```
 
+## Deploy to cloud foundry environment
+
+- Go to ```target``` subfolder.
+- Run ```cf push```
+
 ## Notes
 
 The simulator has user authentication enabled in **cloud profile**. Default credentials:
@@ -30,9 +35,9 @@ http://localhost:8083
 ```
 
  ![](src/main/images/generateScreenshot.png)
- 
+
  ![](src/main/images/updateProcessScreenshot.png)
- 
+
  ![](src/main/images/updateResultOverviewScreenshot.png)
 
 
@@ -54,12 +59,12 @@ Example: for 20 simulated devices (default)
 http://localhost:8083/start
 ```
 
-Example: for 10 simulated devices that start with the name prefix "activeSim": 
+Example: for 10 simulated devices that start with the name prefix "activeSim":
 ```
 http://localhost:8083/start?amount=10&name=activeSim
 ```
 
-Example: for 5 simulated devices that start with the name prefix "ddi" using the Direct Device Integration API (http): 
+Example: for 5 simulated devices that start with the name prefix "ddi" using the Direct Device Integration API (http):
 ```
 http://localhost:8083/start?amount=5&name=ddi?api=ddi
 ```

examples/hawkbit-device-simulator/cf/manifest.yml

@@ -0,0 +1,22 @@
+#
+# Copyright (c) 2015 Bosch Software Innovations GmbH and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+
+---
+applications:
+- name: hawkbit-simulator
+  memory: 1024M
+  instances: 1
+  buildpack: https://github.com/cloudfoundry/java-buildpack
+  path: ${project.build.finalName}.jar
+  services:
+    - dmf-rabbit
+  env:
+    SPRING_PROFILES_ACTIVE: cloud,amqp
+    CF_STAGING_TIMEOUT: 15
+    CF_STARTUP_TIMEOUT: 15

examples/hawkbit-device-simulator/pom.xml

@@ -42,6 +42,19 @@
             </executions>
          </plugin>
       </plugins>
+      <resources>
+         <resource>
+            <directory>src/main/resources</directory>
+         </resource>
+         <resource>
+            <directory>cf</directory>
+            <filtering>true</filtering>
+            <targetPath>${project.build.directory}</targetPath>
+            <includes>
+               <include>manifest.yml</include>
+            </includes>
+         </resource>
+      </resources>
    </build>
 
    <dependencies>

examples/hawkbit-device-simulator/src/main/java/org/eclipse/hawkbit/simulator/DeviceSimulatorUpdater.java

@@ -14,6 +14,7 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
+import org.eclipse.hawkbit.simulator.AbstractSimulatedDevice.Protocol;
 import org.eclipse.hawkbit.simulator.amqp.SpSenderService;
 import org.eclipse.hawkbit.simulator.event.InitUpdate;
 import org.eclipse.hawkbit.simulator.event.ProgressUpdate;
@@ -34,6 +35,9 @@ public class DeviceSimulatorUpdater {
     @Autowired
     private SpSenderService spSenderService;
 
+    @Autowired
+    private SimulatedDeviceFactory deviceFactory;
+
     @Autowired
     private EventBus eventbus;
 
@@ -58,7 +62,13 @@ public class DeviceSimulatorUpdater {
      */
     public void startUpdate(final String tenant, final String id, final long actionId, final String swVersion,
             final UpdaterCallback callback) {
-        final AbstractSimulatedDevice device = repository.get(tenant, id);
+        AbstractSimulatedDevice device = repository.get(tenant, id);
+
+        // plug and play - non existing device will be auto created
+        if (device == null) {
+            device = repository.add(deviceFactory.createSimulatedDevice(id, tenant, Protocol.DMF_AMQP, -1, null, null));
+        }
+
         device.setProgress(0.0);
         device.setSwversion(swVersion);
         eventbus.post(new InitUpdate(device));

examples/hawkbit-device-simulator/src/main/java/org/eclipse/hawkbit/simulator/SimulationController.java

@@ -55,7 +55,7 @@ public class SimulationController {
      *            number of delay in milliseconds to delay polling of DDI
      *            devices
      * @param gatewayToken
-     *            the hawkbit-update-server gatwaytoken in case authentication
+     *            the hawkbit-update-server gatewaytoken in case authentication
      *            is enforced in hawkbit
      * @return a response string that devices has been created
      * @throws MalformedURLException
@@ -68,7 +68,7 @@ public class SimulationController {
             @RequestParam(value = "endpoint", defaultValue = "http://localhost:8080") final String endpoint,
             @RequestParam(value = "polldelay", defaultValue = "30") final int pollDelay,
             @RequestParam(value = "gatewaytoken", defaultValue = "") final String gatewayToken)
-                    throws MalformedURLException {
+            throws MalformedURLException {
 
         final Protocol protocol;
         switch (api.toLowerCase()) {

examples/hawkbit-device-simulator/src/main/java/org/eclipse/hawkbit/simulator/SimulationProperties.java

@@ -0,0 +1,136 @@
+/**
+ * Copyright (c) 2015 Bosch Software Innovations GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
+package org.eclipse.hawkbit.simulator;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.hawkbit.simulator.AbstractSimulatedDevice.Protocol;
+import org.hibernate.validator.constraints.NotEmpty;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * General simulator service properties.
+ *
+ */
+@Component
+@ConfigurationProperties("hawkbit.device.simulator")
+public class SimulationProperties {
+
+    /**
+     * List of tenants where the simulator should auto start simulations after
+     * startup.
+     */
+    private final List<Autostart> autostarts = new ArrayList<>();
+
+    public List<Autostart> getAutostarts() {
+        return this.autostarts;
+    }
+
+    /**
+     * Auto start configuration for simulation setups that the simulator begins
+     * after startup.
+     *
+     */
+    public static class Autostart {
+        /**
+         * Name prefix of simulated devices, followed by counter, e.g.
+         * simulated0, simulated1, simulated2....
+         */
+        private String name = "simulated";
+
+        /**
+         * Amount of simulated devices.
+         */
+        private int amount = 20;
+
+        /**
+         * Tenant name for the simulation.
+         */
+        @NotEmpty
+        private String tenant;
+
+        /**
+         * API for simulation.
+         */
+        private Protocol api = Protocol.DMF_AMQP;
+
+        /**
+         * Endpoint in case of DDI API based simulation.
+         */
+        private String endpoint = "http://localhost:8080";
+
+        /**
+         * Poll time in case of DDI API based simulation.
+         */
+        private int pollDelay = 30;
+
+        /**
+         * Optional gateway token for DDI API based simulation.
+         */
+        private String gatewayToken = "";
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(final String name) {
+            this.name = name;
+        }
+
+        public int getAmount() {
+            return amount;
+        }
+
+        public void setAmount(final int amount) {
+            this.amount = amount;
+        }
+
+        public String getTenant() {
+            return tenant;
+        }
+
+        public void setTenant(final String tenant) {
+            this.tenant = tenant;
+        }
+
+        public Protocol getApi() {
+            return api;
+        }
+
+        public void setApi(final Protocol api) {
+            this.api = api;
+        }
+
+        public String getEndpoint() {
+            return endpoint;
+        }
+
+        public void setEndpoint(final String endpoint) {
+            this.endpoint = endpoint;
+        }
+
+        public int getPollDelay() {
+            return pollDelay;
+        }
+
+        public void setPollDelay(final int pollDelay) {
+            this.pollDelay = pollDelay;
+        }
+
+        public String getGatewayToken() {
+            return gatewayToken;
+        }
+
+        public void setGatewayToken(final String gatewayToken) {
+            this.gatewayToken = gatewayToken;
+        }
+    }
+}

examples/hawkbit-device-simulator/src/main/java/org/eclipse/hawkbit/simulator/SimulatorStartup.java

@@ -0,0 +1,60 @@
+/**
+ * Copyright (c) 2015 Bosch Software Innovations GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
+package org.eclipse.hawkbit.simulator;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import org.eclipse.hawkbit.simulator.amqp.SpSenderService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationListener;
+import org.springframework.context.event.ContextRefreshedEvent;
+import org.springframework.stereotype.Component;
+
+/**
+ * Execution of operations after startup. Set up of simulations.
+ *
+ */
+@Component
+public class SimulatorStartup implements ApplicationListener<ContextRefreshedEvent> {
+    private static final Logger LOGGER = LoggerFactory.getLogger(SimulatorStartup.class);
+
+    @Autowired
+    private SimulationProperties simulationProperties;
+
+    @Autowired
+    private SpSenderService spSenderService;
+
+    @Autowired
+    private DeviceSimulatorRepository repository;
+
+    @Autowired
+    private SimulatedDeviceFactory deviceFactory;
+
+    @Override
+    public void onApplicationEvent(final ContextRefreshedEvent event) {
+        simulationProperties.getAutostarts().forEach(autostart -> {
+            for (int i = 0; i < autostart.getAmount(); i++) {
+                final String deviceId = autostart.getName() + i;
+                try {
+                    repository.add(deviceFactory.createSimulatedDevice(deviceId, autostart.getTenant(),
+                            autostart.getApi(), autostart.getPollDelay(), new URL(autostart.getEndpoint()),
+                            autostart.getGatewayToken()));
+                } catch (final MalformedURLException e) {
+                    LOGGER.error("Creation of simulated device at startup failed.", e);
+                }
+
+                spSenderService.createOrUpdateThing(autostart.getTenant(), deviceId);
+            }
+        });
+    }
+
+}

examples/hawkbit-device-simulator/src/main/java/org/eclipse/hawkbit/simulator/amqp/AmqpConfiguration.java

@@ -59,7 +59,8 @@ public class AmqpConfiguration {
     }
 
     /**
-     * Create the receiver queue from sp. Receive messages from sp.
+     * Creates the receiver queue from update server for receiving message from
+     * update server.
      *
      * @return the queue
      */
@@ -70,7 +71,7 @@ public class AmqpConfiguration {
     }
 
     /**
-     * Create the recevier exchange. Sp send messages to this exchange.
+     * Creates the receiver exchange for sending messages to update server.
      *
      * @return the exchange
      */

examples/hawkbit-device-simulator/src/main/java/org/eclipse/hawkbit/simulator/amqp/AmqpProperties.java

@@ -19,26 +19,25 @@ import org.springframework.stereotype.Component;
 @Component
 @ConfigurationProperties("hawkbit.device.simulator.amqp")
 public class AmqpProperties {
-
     /**
      * Queue for receiving DMF messages from update server.
      */
-    private String receiverConnectorQueueFromSp;
+    private String receiverConnectorQueueFromSp = "simulator_receiver";
 
     /**
      * Exchange for sending DMF messages to update server.
      */
-    private String senderForSpExchange;
+    private String senderForSpExchange = "simulator.replyTo";
 
     /**
      * Simulator dead letter queue.
      */
-    private String deadLetterQueue;
+    private String deadLetterQueue = "simulator_deadletter";
 
     /**
      * Simulator dead letter exchange.
      */
-    private String deadLetterExchange;
+    private String deadLetterExchange = "simulator.deadletter";
 
     public String getReceiverConnectorQueueFromSp() {
         return receiverConnectorQueueFromSp;

examples/hawkbit-device-simulator/src/main/java/org/eclipse/hawkbit/simulator/amqp/SpReceiverService.java

@@ -26,14 +26,11 @@ import org.springframework.messaging.handler.annotation.Header;
 import org.springframework.stereotype.Component;
 
 /**
- * Handle all incoming Messages from SP.
+ * Handle all incoming Messages from hawkBit update server.
- *
- *
  *
  */
 @Component
 public class SpReceiverService extends ReceiverService {
-
     private static final Logger LOGGER = LoggerFactory.getLogger(ReceiverService.class);
 
     public static final String SOFTWARE_MODULE_FIRMWARE = "firmware";
@@ -44,17 +41,6 @@ public class SpReceiverService extends ReceiverService {
 
     /**
      * Constructor.
-     *
-     * @param rabbitTemplate
-     *            the rabbit template
-     * @param amqpProperties
-     *            the amqp properties
-     * @param lwm2mSenderService
-     *            the lwm2mSenderService
-     * @param spSenderService
-     *            the spSenderService
-     * @param deviceUpdater
-     *            the updater service to simulate update process
      */
     @Autowired
     public SpReceiverService(final RabbitTemplate rabbitTemplate, final AmqpProperties amqpProperties,
@@ -62,12 +48,11 @@ public class SpReceiverService extends ReceiverService {
         super(rabbitTemplate, amqpProperties);
         this.spSenderService = spSenderService;
         this.deviceUpdater = deviceUpdater;
-
     }
 
     /**
      * Handle the incoming Message from Queue with the property
-     * (com.bosch.sp.lwm2m.connector.amqp.receiverConnectorQueueFromSp).
+     * (hawkbit.device.simulator.amqp.receiverConnectorQueueFromSp).
      *
      * @param message
      *            the incoming message

examples/hawkbit-device-simulator/src/main/resources/application.properties

@@ -7,18 +7,17 @@
 # http://www.eclipse.org/legal/epl-v10.html
 #
 
-
+## Configuration for DMF communication
-#########################################################################################
-# PUBLIC configuration, i.e. can be changed by users at runtime (defaults provided here)
-#########################################################################################
-## Configuration for RabbitMQ communication
 hawkbit.device.simulator.amqp.receiverConnectorQueueFromSp=simulator_receiver
 hawkbit.device.simulator.amqp.deadLetterQueue=simulator_deadletter
 hawkbit.device.simulator.amqp.deadLetterExchange=simulator.deadletter
 hawkbit.device.simulator.amqp.senderForSpExchange=simulator.replyTo
 
+## Configuration for simulations
+hawkbit.device.simulator.autostarts.[0].tenant=DEFAULT
 
-## Configuration for RabbitMQ integration
+
+## Configuration for local RabbitMQ integration
 spring.rabbitmq.username=guest
 spring.rabbitmq.password=guest
 spring.rabbitmq.virtualHost=/

examples/hawkbit-example-app/README.md

@@ -1,7 +1,15 @@
 # hawkBit Example Application
-The hawkBit example application is a standalone spring-boot application with an embedded servlet container to start the hawkBit.
+The hawkBit example application is a standalone spring-boot application with an embedded servlet container to host the hawkBit Update Server.
 
-## Run
+We have have described several options for you to get access to the example.
+
+## Try out the example application in our hawkBit sandbox on Bluemix
+- try out Management UI https://hawkbit.eu-gb.mybluemix.net/UI
+- try out Management API https://hawkbit.eu-gb.mybluemix.net/rest/v1/targets (don't forget basic auth header)
+- try out DDI API https://hawkbit.eu-gb.mybluemix.net/DEFAULT/controller/v1/MYTESTDEVICE
+
+## On your own workstation
+### Run
 ```
 java -jar examples/hawkbit-example-app/target/hawkbit-example-app-*-SNAPSHOT.jar
 ```
@@ -10,6 +18,14 @@ Or:
 run org eclipse.hawkbit.app.Start
 ```
 
-## Usage
+### Usage
-The UI can be accessed via _http://localhost:8080/UI_.
+The Management UI can be accessed via http://localhost:8080/UI
-The REST API can be accessed via _http://localhost:8080/rest/v1_.
+The Management API can be accessed via http://localhost:8080/rest/v1
+
+## Deploy example app to Cloud Foundry
+
+- Go to ```target``` subfolder.
+- Select one of the two manifests
+ - **manifest-simple.yml** for a standalone hawkBit installation with embedded H2.
+ - **manifest.yml**  for a standalone hawkBit installation with embedded H2 and RabbitMQ service binding for DMF integration (note: this manifest is used for the sandbox above).
+- Run ```cf push``` against you cloud foundry environment.

examples/hawkbit-example-app/cf/manifest-simple.yml

@@ -0,0 +1,20 @@
+#
+# Copyright (c) 2015 Bosch Software Innovations GmbH and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+
+---
+applications:
+- name: hawkbit-simple
+  memory: 1024M
+  instances: 1
+  buildpack: https://github.com/cloudfoundry/java-buildpack
+  path: ${project.build.finalName}.jar
+  env:
+    SPRING_PROFILES_ACTIVE: cloudsandbox
+    CF_STAGING_TIMEOUT: 15
+    CF_STARTUP_TIMEOUT: 15

examples/hawkbit-example-app/cf/manifest.yml

@@ -0,0 +1,22 @@
+#
+# Copyright (c) 2015 Bosch Software Innovations GmbH and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+
+---
+applications:
+- name: hawkbit
+  memory: 1024M
+  instances: 1
+  buildpack: https://github.com/cloudfoundry/java-buildpack
+  path: ${project.build.finalName}.jar
+  services:
+    - dmf-rabbit
+  env:
+    SPRING_PROFILES_ACTIVE: cloudsandbox,amqp
+    CF_STAGING_TIMEOUT: 15
+    CF_STARTUP_TIMEOUT: 15

examples/hawkbit-example-app/pom.xml

@@ -39,6 +39,20 @@
             </executions>
          </plugin>
       </plugins>
+      <resources>
+         <resource>
+            <directory>src/main/resources</directory>
+         </resource>
+         <resource>
+            <directory>cf</directory>
+            <filtering>true</filtering>
+            <targetPath>${project.build.directory}</targetPath>
+            <includes>
+               <include>manifest.yml</include>
+               <include>manifest-simple.yml</include>
+            </includes>
+         </resource>
+      </resources>
    </build>
 
    <dependencies>

examples/hawkbit-example-app/src/main/resources/application-cloudsandbox.properties

@@ -0,0 +1,10 @@
+#
+# Copyright (c) 2015 Bosch Software Innovations GmbH and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+
+vaadin.servlet.productionMode=true

examples/hawkbit-mgmt-api-client/README.md

@@ -1,4 +1,4 @@
-# HawkBit management API example
+# hawkBit Management API example client
 
 Example client that shows how to efficiently use the hawkBit management API.
 
@@ -36,4 +36,3 @@ In rollout mode:
 * assigning software modules to distribution sets
 * creating a rollout
 * starting a rollout
-

examples/hawkbit-mgmt-api-client/src/main/java/org/eclipse/hawkbit/mgmt/client/resource/DistributionSetResourceClient.java

@@ -14,7 +14,7 @@ import org.springframework.cloud.netflix.feign.FeignClient;
 /**
  * Client binding for the DistributionSet resource of the management API.
  */
-@FeignClient(url = "${hawkbit.endpoint.url:localhost:8080}/rest/v1/distributionsets")
+@FeignClient(url = "${hawkbit.url:localhost:8080}/rest/v1/distributionsets")
 public interface DistributionSetResourceClient extends DistributionSetRestApi {
 
 }

examples/hawkbit-mgmt-api-client/src/main/java/org/eclipse/hawkbit/mgmt/client/resource/DistributionSetTagResourceClient.java

@@ -14,7 +14,7 @@ import org.springframework.cloud.netflix.feign.FeignClient;
 /**
  * Client binding for the DistributionSetTag resource of the management API.
  */
-@FeignClient(url = "${hawkbit.endpoint.url:localhost:8080}/rest/v1/distributionsettags")
+@FeignClient(url = "${hawkbit.url:localhost:8080}/rest/v1/distributionsettags")
 public interface DistributionSetTagResourceClient extends DistributionSetTagRestApi {
 
 }

examples/hawkbit-mgmt-api-client/src/main/java/org/eclipse/hawkbit/mgmt/client/resource/DistributionSetTypeResourceClient.java

@@ -15,7 +15,7 @@ import org.springframework.cloud.netflix.feign.FeignClient;
  * Client binding for the DistributionSetType resource of the management API.
  *
  */
-@FeignClient(url = "${hawkbit.endpoint.url:localhost:8080}/rest/v1/distributionsettypes")
+@FeignClient(url = "${hawkbit.url:localhost:8080}/rest/v1/distributionsettypes")
 public interface DistributionSetTypeResourceClient extends DistributionSetTypeRestApi {
 
 }

examples/hawkbit-mgmt-api-client/src/main/java/org/eclipse/hawkbit/mgmt/client/resource/RolloutResourceClient.java

@@ -14,7 +14,7 @@ import org.springframework.cloud.netflix.feign.FeignClient;
 /**
  * Client binding for the Rollout resource of the management API.
  */
-@FeignClient(url = "${hawkbit.endpoint.url:localhost:8080}/rest/v1/rollouts")
+@FeignClient(url = "${hawkbit.url:localhost:8080}/rest/v1/rollouts")
 public interface RolloutResourceClient extends RolloutRestApi {
 
 }

examples/hawkbit-mgmt-api-client/src/main/java/org/eclipse/hawkbit/mgmt/client/resource/SoftwareModuleResourceClient.java

@@ -14,7 +14,7 @@ import org.springframework.cloud.netflix.feign.FeignClient;
 /**
  * Client binding for the SoftwareModule resource of the management API.
  */
-@FeignClient(url = "${hawkbit.endpoint.url:localhost:8080}/rest/v1/softwaremodules")
+@FeignClient(url = "${hawkbit.url:localhost:8080}/rest/v1/softwaremodules")
 public interface SoftwareModuleResourceClient extends SoftwareModuleRestAPI {
 
 }

examples/hawkbit-mgmt-api-client/src/main/java/org/eclipse/hawkbit/mgmt/client/resource/SoftwareModuleTypeResourceClient.java

@@ -14,7 +14,7 @@ import org.springframework.cloud.netflix.feign.FeignClient;
 /**
  * Client binding for the oftwareModuleType resource of the management API.
  */
-@FeignClient(url = "${hawkbit.endpoint.url:localhost:8080}/rest/v1/softwaremoduletypes")
+@FeignClient(url = "${hawkbit.url:localhost:8080}/rest/v1/softwaremoduletypes")
 public interface SoftwareModuleTypeResourceClient extends SoftwareModuleTypeRestApi {
 
 }

examples/hawkbit-mgmt-api-client/src/main/java/org/eclipse/hawkbit/mgmt/client/resource/TargetResourceClient.java

@@ -14,7 +14,7 @@ import org.springframework.cloud.netflix.feign.FeignClient;
 /**
  * Client binding for the Target resource of the management API.
  */
-@FeignClient(url = "${hawkbit.endpoint.url:localhost:8080}/rest/v1/targets")
+@FeignClient(url = "${hawkbit.url:localhost:8080}/rest/v1/targets")
 public interface TargetResourceClient extends TargetRestApi {
 
 }

examples/hawkbit-mgmt-api-client/src/main/java/org/eclipse/hawkbit/mgmt/client/resource/TargetTagResourceClient.java

@@ -14,7 +14,7 @@ import org.springframework.cloud.netflix.feign.FeignClient;
 /**
  * Client binding for the TargetTag resource of the management API.
  */
-@FeignClient(url = "${hawkbit.endpoint.url:localhost:8080}/rest/v1/targettags")
+@FeignClient(url = "${hawkbit.url:localhost:8080}/rest/v1/targettags")
 public interface TargetTagResourceClient extends TargetTagRestApi {
 
 }

examples/hawkbit-mgmt-api-client/src/main/java/org/eclipse/hawkbit/mgmt/client/resource/builder/DistributionSetBuilder.java

@@ -16,11 +16,7 @@ import org.eclipse.hawkbit.rest.resource.model.distributionset.DistributionSetRe
 import com.google.common.collect.Lists;
 
 /**
- * 
  * Builder pattern for building {@link DistributionSetRequestBodyPost}.
- * 
- * @author Jonathan Knoblauch
- *
  */
 public class DistributionSetBuilder {
 

examples/hawkbit-mgmt-api-client/src/main/java/org/eclipse/hawkbit/mgmt/client/resource/builder/DistributionSetTypeBuilder.java

@@ -19,8 +19,6 @@ import com.google.common.collect.Lists;
 /**
  * 
  * Builder pattern for building {@link DistributionSetTypeRequestBodyPost}.
- * 
- * @author Jonathan Knoblauch
  *
  */
 public class DistributionSetTypeBuilder {

examples/hawkbit-mgmt-api-client/src/main/java/org/eclipse/hawkbit/mgmt/client/resource/builder/RolloutBuilder.java

@@ -15,8 +15,6 @@ import org.eclipse.hawkbit.rest.resource.model.rollout.RolloutRestRequestBody;
 /**
  * 
  * Builder pattern for building {@link RolloutRestRequestBody}.
- * 
- * @author Jonathan Knoblauch
  *
  */
 public class RolloutBuilder {

examples/hawkbit-mgmt-api-client/src/main/java/org/eclipse/hawkbit/mgmt/client/resource/builder/SoftwareModuleAssigmentBuilder.java

@@ -16,8 +16,6 @@ import org.eclipse.hawkbit.rest.resource.model.softwaremodule.SoftwareModuleAssi
 /**
  * 
  * Builder pattern for building {@link SoftwareModuleAssigmentRest}.
- * 
- * @author Jonathan Knoblauch
  *
  */
 public class SoftwareModuleAssigmentBuilder {

examples/hawkbit-mgmt-api-client/src/main/java/org/eclipse/hawkbit/mgmt/client/resource/builder/SoftwareModuleBuilder.java

@@ -19,8 +19,6 @@ import com.google.common.collect.Lists;
 /**
  * 
  * Builder pattern for building {@link SoftwareModuleRequestBodyPost}.
- * 
- * @author Jonathan Knoblauch
  *
  */
 public class SoftwareModuleBuilder {

examples/hawkbit-mgmt-api-client/src/main/java/org/eclipse/hawkbit/mgmt/client/resource/builder/SoftwareModuleTypeBuilder.java

@@ -19,8 +19,6 @@ import com.google.common.collect.Lists;
 /**
  * 
  * Builder pattern for building {@link SoftwareModuleRequestBodyPost}.
- * 
- * @author Jonathan Knoblauch
  *
  */
 public class SoftwareModuleTypeBuilder {

examples/hawkbit-mgmt-api-client/src/main/java/org/eclipse/hawkbit/mgmt/client/resource/builder/TagBuilder.java

@@ -17,8 +17,6 @@ import com.google.common.collect.Lists;
 
 /**
  * Builder pattern for building {@link TagRequestBodyPut}.
- * 
- * @author Jonathan Knoblauch
  *
  */
 public class TagBuilder {

examples/hawkbit-mgmt-api-client/src/main/java/org/eclipse/hawkbit/mgmt/client/resource/builder/TargetBuilder.java

@@ -19,8 +19,6 @@ import com.google.common.collect.Lists;
 /**
  * 
  * Builder pattern for building {@link TargetRequestBody}.
- * 
- * @author Jonathan Knoblauch
  *
  */
 public class TargetBuilder {

examples/hawkbit-mgmt-api-client/src/main/java/org/eclipse/hawkbit/mgmt/client/scenarios/CreateStartedRolloutExample.java

@@ -41,7 +41,7 @@ public class CreateStartedRolloutExample {
     private static final String SM_MODULE_TYPE = "firmware";
 
     /* known distribution set type name and key */
-    private static final String DS_MODULE_TYPE = "firmware";
+    private static final String DS_MODULE_TYPE = SM_MODULE_TYPE;
 
     @Autowired
     private DistributionSetResourceClient distributionSetResource;

examples/hawkbit-mgmt-api-client/src/main/java/org/eclipse/hawkbit/mgmt/client/scenarios/GettingStartedDefaultScenario.java

@@ -41,13 +41,13 @@ public class GettingStartedDefaultScenario {
     private static final String SM_MODULE_TYPE = "gettingstarted";
 
     /* known distribution set type name and key */
-    private static final String DS_MODULE_TYPE = "gettingstarted";
+    private static final String DS_MODULE_TYPE = SM_MODULE_TYPE;
 
     /* known distribution name of this getting started example */
     private static final String SM_EXAMPLE_NAME = "gettingstarted-example";
 
     /* known distribution name of this getting started example */
-    private static final String DS_EXAMPLE_NAME = "gettingstarted-example";
+    private static final String DS_EXAMPLE_NAME = SM_EXAMPLE_NAME;
 
     @Autowired
     private DistributionSetResourceClient distributionSetResource;

hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/security/SecurityManagedConfiguration.java

@@ -10,7 +10,6 @@ package org.eclipse.hawkbit.autoconfigure.security;
 
 import java.io.IOException;
 import java.net.URI;
-import java.util.Collections;
 
 import javax.annotation.PostConstruct;
 import javax.servlet.Filter;
@@ -35,6 +34,7 @@ import org.eclipse.hawkbit.security.ControllerTenantAwareAuthenticationDetailsSo
 import org.eclipse.hawkbit.security.DdiSecurityProperties;
 import org.eclipse.hawkbit.security.DosFilter;
 import org.eclipse.hawkbit.security.HawkbitSecurityProperties;
+import org.eclipse.hawkbit.security.HttpControllerPreAuthenticateAnonymousDownloadFilter;
 import org.eclipse.hawkbit.security.HttpControllerPreAuthenticateSecurityTokenFilter;
 import org.eclipse.hawkbit.security.HttpControllerPreAuthenticatedGatewaySecurityTokenFilter;
 import org.eclipse.hawkbit.security.HttpControllerPreAuthenticatedSecurityHeaderFilter;
@@ -83,6 +83,8 @@ import org.vaadin.spring.security.web.VaadinRedirectStrategy;
 import org.vaadin.spring.security.web.authentication.VaadinAuthenticationSuccessHandler;
 import org.vaadin.spring.security.web.authentication.VaadinUrlAuthenticationSuccessHandler;
 
+import com.google.common.collect.Lists;
+
 /**
  * All configurations related to SP authentication and authorization layer.
  *
@@ -147,6 +149,12 @@ public class SecurityManagedConfiguration {
             gatewaySecurityTokenFilter.setCheckForPrincipalChanges(true);
             gatewaySecurityTokenFilter.setAuthenticationDetailsSource(authenticationDetailsSource);
 
+            final HttpControllerPreAuthenticateAnonymousDownloadFilter controllerAnonymousDownloadFilter = new HttpControllerPreAuthenticateAnonymousDownloadFilter(
+                    tenantConfigurationManagement, tenantAware, systemSecurityContext);
+            controllerAnonymousDownloadFilter.setAuthenticationManager(authenticationManager());
+            controllerAnonymousDownloadFilter.setCheckForPrincipalChanges(true);
+            controllerAnonymousDownloadFilter.setAuthenticationDetailsSource(authenticationDetailsSource);
+
             HttpSecurity httpSec = http.csrf().disable().headers()
                     .addHeaderWriter(new XFrameOptionsHeaderWriter(XFrameOptionsMode.DENY)).contentTypeOptions()
                     .xssProtection().httpStrictTransportSecurity().and();
@@ -159,15 +167,17 @@ public class SecurityManagedConfiguration {
                 LOG.info(
                         "******************\n** Anonymous controller security enabled, should only use for developing purposes **\n******************");
                 final AnonymousAuthenticationFilter anoymousFilter = new AnonymousAuthenticationFilter(
-                        "controllerAnonymousFilter", "anonymous", Collections.singletonList(
+                        "controllerAnonymousFilter", "anonymous",
-                                new SimpleGrantedAuthority(SpringEvalExpressions.CONTROLLER_ROLE_ANONYMOUS)));
+                        Lists.newArrayList(new SimpleGrantedAuthority(SpringEvalExpressions.CONTROLLER_ROLE_ANONYMOUS),
+                                new SimpleGrantedAuthority(SpringEvalExpressions.CONTROLLER_DOWNLOAD_ROLE)));
                 anoymousFilter.setAuthenticationDetailsSource(authenticationDetailsSource);
                 httpSec.requestMatchers().antMatchers("/*/controller/v1/**", "/*/controller/artifacts/v1/**").and()
                         .securityContext().disable().anonymous().authenticationFilter(anoymousFilter);
             } else {
                 httpSec.addFilter(securityHeaderFilter).addFilter(securityTokenFilter)
-                        .addFilter(gatewaySecurityTokenFilter).antMatcher("/*/controller/**").anonymous().disable()
+                        .addFilter(gatewaySecurityTokenFilter).addFilter(controllerAnonymousDownloadFilter)
-                        .authorizeRequests().anyRequest().authenticated().and().exceptionHandling()
+                        .antMatcher("/*/controller/**").anonymous().disable().authorizeRequests().anyRequest()
+                        .authenticated().and().exceptionHandling()
                         .authenticationEntryPoint((request, response, authException) -> response
                                 .setStatus(HttpStatus.UNAUTHORIZED.value()))
                         .and().sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS);

hawkbit-core/src/main/java/org/eclipse/hawkbit/api/ArtifactUrlHandler.java

@@ -0,0 +1,37 @@
+/**
+ * Copyright (c) 2015 Bosch Software Innovations GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
+package org.eclipse.hawkbit.api;
+
+/**
+ * Interface declaration of the {@link ArtifactUrlHandler} which generates the
+ * URLs to specific artifacts.
+ *
+ */
+@FunctionalInterface
+public interface ArtifactUrlHandler {
+
+    /**
+     * Returns a generated download URL for a given artifact parameters for a
+     * specific protocol.
+     *
+     * @param controllerId
+     *            the authenticated controller id
+     * @param softwareModuleId
+     *            the softwareModuleId belonging to the artifact
+     * @param filename
+     *            the filename of the artifact
+     * @param sha1Hash
+     *            the sha1Hash of the artifact
+     * @param protocol
+     *            the protocol the URL should be generated
+     * @return an URL for the given artifact parameters in a given protocol
+     */
+    String getUrl(String controllerId, final Long softwareModuleId, final String filename, final String sha1Hash,
+            final UrlProtocol protocol);
+}

hawkbit-core/src/main/java/org/eclipse/hawkbit/api/ArtifactUrlHandlerProperties.java

@@ -6,13 +6,13 @@
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  */
-package org.eclipse.hawkbit.util;
+package org.eclipse.hawkbit.api;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
 /**
- *
+ * Artifact handler properties class for holding all supported protocols with
- *
+ * host, ip, port and download pattern.
  */
 @ConfigurationProperties("hawkbit.artifact.url")
 public class ArtifactUrlHandlerProperties {
@@ -23,23 +23,14 @@ public class ArtifactUrlHandlerProperties {
     private final Https https = new Https();
     private final Coap coap = new Coap();
 
-    /**
-     * @return the http
-     */
     public Http getHttp() {
         return http;
     }
 
-    /**
-     * @return the https
-     */
     public Https getHttps() {
         return https;
     }
 
-    /**
-     * @return the coap
-     */
     public Coap getCoap() {
         return coap;
     }
@@ -66,9 +57,6 @@ public class ArtifactUrlHandlerProperties {
     /**
      * Interface for declaring common properties through all supported protocols
      * pattern.
-     *
-     *
-     *
      */
     public interface ProtocolProperties {
         /**
@@ -94,9 +82,6 @@ public class ArtifactUrlHandlerProperties {
 
     /**
      * Object to hold the properties for the HTTP protocol.
-     *
-     *
-     *
      */
     public static class Http implements ProtocolProperties {
         private String hostname = LOCALHOST;
@@ -108,66 +93,38 @@ public class ArtifactUrlHandlerProperties {
          */
         private String pattern = "{protocol}://{hostname}:{port}/{tenant}/controller/v1/{targetId}/softwaremodules/{softwareModuleId}/artifacts/{artifactFileName}";
 
-        /**
-         * @return the hostname
-         */
         @Override
         public String getHostname() {
             return hostname;
         }
 
-        /**
-         * @param hostname
-         *            the hostname to set
-         */
         public void setHostname(final String hostname) {
             this.hostname = hostname;
         }
 
-        /**
-         * @return the ip
-         */
         @Override
         public String getIp() {
             return ip;
         }
 
-        /**
-         * @param ip
-         *            the ip to set
-         */
         public void setIp(final String ip) {
             this.ip = ip;
         }
 
-        /**
-         * @return the urlPattern
-         */
         @Override
         public String getPattern() {
             return pattern;
         }
 
-        /**
-         * @param urlPattern
-         *            the urlPattern to set
-         */
         public void setPattern(final String urlPattern) {
             this.pattern = urlPattern;
         }
 
-        /**
-         * @return the port
-         */
         @Override
         public String getPort() {
             return port;
         }
 
-        /**
-         * @param port
-         *            the port to set
-         */
         public void setPort(final String port) {
             this.port = port;
         }
@@ -175,9 +132,6 @@ public class ArtifactUrlHandlerProperties {
 
     /**
      * Object to hold the properties for the HTTP protocol.
-     *
-     *
-     *
      */
     public static class Https implements ProtocolProperties {
         private String hostname = LOCALHOST;
@@ -189,66 +143,38 @@ public class ArtifactUrlHandlerProperties {
          */
         private String pattern = "{protocol}://{hostname}:{port}/{tenant}/controller/v1/{targetId}/softwaremodules/{softwareModuleId}/artifacts/{artifactFileName}";
 
-        /**
-         * @return the hostname
-         */
         @Override
         public String getHostname() {
             return hostname;
         }
 
-        /**
-         * @param hostname
-         *            the hostname to set
-         */
         public void setHostname(final String hostname) {
             this.hostname = hostname;
         }
 
-        /**
-         * @return the ip
-         */
         @Override
         public String getIp() {
             return ip;
         }
 
-        /**
-         * @param ip
-         *            the ip to set
-         */
         public void setIp(final String ip) {
             this.ip = ip;
         }
 
-        /**
-         * @return the urlPattern
-         */
         @Override
         public String getPattern() {
             return pattern;
         }
 
-        /**
-         * @param urlPattern
-         *            the urlPattern to set
-         */
         public void setPattern(final String urlPattern) {
             this.pattern = urlPattern;
         }
 
-        /**
-         * @return the port
-         */
         @Override
         public String getPort() {
             return port;
         }
 
-        /**
-         * @param port
-         *            the port to set
-         */
         public void setPort(final String port) {
             this.port = port;
         }
@@ -256,9 +182,6 @@ public class ArtifactUrlHandlerProperties {
 
     /**
      * Object to hold the properties for the HTTP protocol.
-     *
-     *
-     *
      */
     public static class Coap implements ProtocolProperties {
         private String hostname = LOCALHOST;
@@ -270,68 +193,41 @@ public class ArtifactUrlHandlerProperties {
          */
         private String pattern = "{protocol}://{ip}:{port}/fw/{tenant}/{targetId}/sha1/{artifactSHA1}";
 
-        /**
-         * @return the hostname
-         */
         @Override
         public String getHostname() {
             return hostname;
         }
 
-        /**
-         * @param hostname
-         *            the hostname to set
-         */
         public void setHostname(final String hostname) {
             this.hostname = hostname;
         }
 
-        /**
-         * @return the ip
-         */
         @Override
         public String getIp() {
             return ip;
         }
 
-        /**
-         * @param ip
-         *            the ip to set
-         */
         public void setIp(final String ip) {
             this.ip = ip;
         }
 
-        /**
-         * @return the urlPattern
-         */
         @Override
         public String getPattern() {
             return pattern;
         }
 
-        /**
-         * @param urlPattern
-         *            the urlPattern to set
-         */
         public void setPattern(final String urlPattern) {
             this.pattern = urlPattern;
         }
 
-        /**
-         * @return the port
-         */
         @Override
         public String getPort() {
             return port;
         }
 
-        /**
-         * @param port
-         *            the port to set
-         */
         public void setPort(final String port) {
             this.port = port;
         }
     }
+
 }

hawkbit-core/src/main/java/org/eclipse/hawkbit/api/PropertyBasedArtifactUrlHandler.java

@@ -6,17 +6,15 @@
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  */
-package org.eclipse.hawkbit.util;
+package org.eclipse.hawkbit.api;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 
-import org.eclipse.hawkbit.dmf.json.model.Artifact;
+import org.eclipse.hawkbit.api.ArtifactUrlHandlerProperties.ProtocolProperties;
-import org.eclipse.hawkbit.repository.model.LocalArtifact;
 import org.eclipse.hawkbit.tenancy.TenantAware;
-import org.eclipse.hawkbit.util.ArtifactUrlHandlerProperties.ProtocolProperties;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.stereotype.Component;
@@ -24,8 +22,8 @@ import org.springframework.stereotype.Component;
 import com.google.common.base.Strings;
 
 /**
- *
+ * Implementation for ArtifactUrlHandler for creating urls to download resource
- *
+ * based on pattern.
  */
 @Component
 @EnableConfigurationProperties(ArtifactUrlHandlerProperties.class)
@@ -48,7 +46,9 @@ public class PropertyBasedArtifactUrlHandler implements ArtifactUrlHandler {
     private TenantAware tenantAware;
 
     @Override
-    public String getUrl(final String targetId, final LocalArtifact artifact, final Artifact.UrlProtocol protocol) {
+    public String getUrl(final String targetId, final Long softwareModuleId, final String filename,
+            final String sha1Hash, final UrlProtocol protocol) {
+
         final String protocolString = protocol.name().toLowerCase();
         final ProtocolProperties properties = urlHandlerProperties.getProperties(protocolString);
         if (properties == null || properties.getPattern() == null) {
@@ -56,8 +56,8 @@ public class PropertyBasedArtifactUrlHandler implements ArtifactUrlHandler {
         }
 
         String urlPattern = properties.getPattern();
-        final Set<Entry<String, String>> entrySet = getReplaceMap(targetId, artifact, protocolString, properties)
+        final Set<Entry<String, String>> entrySet = getReplaceMap(targetId, softwareModuleId, filename, sha1Hash,
-                .entrySet();
+                protocolString, properties).entrySet();
         for (final Entry<String, String> entry : entrySet) {
             if (entry.getKey().equals(PORT_PLACEHOLDER)) {
                 urlPattern = urlPattern.replace(":{" + entry.getKey() + "}",
@@ -69,18 +69,18 @@ public class PropertyBasedArtifactUrlHandler implements ArtifactUrlHandler {
         return urlPattern;
     }
 
-    private Map<String, String> getReplaceMap(final String targetId, final LocalArtifact artifact,
+    private Map<String, String> getReplaceMap(final String targetId, final Long softwareModuleId, final String filename,
-            final String protocol, final ProtocolProperties properties) {
+            final String sha1Hash, final String protocol, final ProtocolProperties properties) {
         final Map<String, String> replaceMap = new HashMap<>();
         replaceMap.put(IP_PLACEHOLDER, properties.getIp());
         replaceMap.put(HOSTNAME_PLACEHOLDER, properties.getHostname());
-        replaceMap.put(ARTIFACT_FILENAME_PLACEHOLDER, artifact.getFilename());
+        replaceMap.put(ARTIFACT_FILENAME_PLACEHOLDER, filename);
-        replaceMap.put(ARTIFACT_SHA1_PLACEHOLDER, artifact.getSha1Hash());
+        replaceMap.put(ARTIFACT_SHA1_PLACEHOLDER, sha1Hash);
         replaceMap.put(PROTOCOL_PLACEHOLDER, protocol);
         replaceMap.put(PORT_PLACEHOLDER, properties.getPort());
         replaceMap.put(TENANT_PLACEHOLDER, tenantAware.getCurrentTenant());
         replaceMap.put(TARGET_ID_PLACEHOLDER, targetId);
-        replaceMap.put(SOFTWARE_MODULE_ID_PLACDEHOLDER, String.valueOf(artifact.getSoftwareModule().getId()));
+        replaceMap.put(SOFTWARE_MODULE_ID_PLACDEHOLDER, String.valueOf(softwareModuleId));
         return replaceMap;
     }
 

hawkbit-core/src/main/java/org/eclipse/hawkbit/api/UrlProtocol.java

@@ -0,0 +1,16 @@
+/**
+ * Copyright (c) 2015 Bosch Software Innovations GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
+package org.eclipse.hawkbit.api;
+
+/**
+ * Represented the supported protocols for artifact url's.
+ */
+public enum UrlProtocol {
+    COAP, HTTP, HTTPS
+}

hawkbit-core/src/main/java/org/eclipse/hawkbit/tenancy/configuration/TenantConfigurationKey.java

@@ -30,40 +30,60 @@ public enum TenantConfigurationKey {
     /**
      * boolean value {@code true} {@code false}.
      */
-    AUTHENTICATION_MODE_HEADER_ENABLED("authentication.header.enabled", "hawkbit.server.ddi.security.authentication.header.enabled", Boolean.class, Boolean.FALSE.toString(), TenantConfigurationBooleanValidator.class),
+    AUTHENTICATION_MODE_HEADER_ENABLED("authentication.header.enabled",
+            "hawkbit.server.ddi.security.authentication.header.enabled", Boolean.class, Boolean.FALSE.toString(),
+            TenantConfigurationBooleanValidator.class),
     /**
     *
     */
-    AUTHENTICATION_MODE_HEADER_AUTHORITY_NAME("authentication.header.authority", "hawkbit.server.ddi.security.authentication.header.authority", String.class, Boolean.FALSE.toString(), TenantConfigurationStringValidator.class),
+    AUTHENTICATION_MODE_HEADER_AUTHORITY_NAME("authentication.header.authority",
+            "hawkbit.server.ddi.security.authentication.header.authority", String.class, Boolean.FALSE.toString(),
+            TenantConfigurationStringValidator.class),
     /**
      * boolean value {@code true} {@code false}.
      */
-    AUTHENTICATION_MODE_TARGET_SECURITY_TOKEN_ENABLED("authentication.targettoken.enabled", "hawkbit.server.ddi.security.authentication.targettoken.enabled", Boolean.class, Boolean.FALSE.toString(), TenantConfigurationBooleanValidator.class),
+    AUTHENTICATION_MODE_TARGET_SECURITY_TOKEN_ENABLED("authentication.targettoken.enabled",
+            "hawkbit.server.ddi.security.authentication.targettoken.enabled", Boolean.class, Boolean.FALSE.toString(),
+            TenantConfigurationBooleanValidator.class),
 
     /**
      * boolean value {@code true} {@code false}.
      */
-    AUTHENTICATION_MODE_GATEWAY_SECURITY_TOKEN_ENABLED("authentication.gatewaytoken.enabled", "hawkbit.server.ddi.security.authentication.gatewaytoken.enabled", Boolean.class, Boolean.FALSE.toString(), TenantConfigurationBooleanValidator.class),
+    AUTHENTICATION_MODE_GATEWAY_SECURITY_TOKEN_ENABLED("authentication.gatewaytoken.enabled",
+            "hawkbit.server.ddi.security.authentication.gatewaytoken.enabled", Boolean.class, Boolean.FALSE.toString(),
+            TenantConfigurationBooleanValidator.class),
     /**
      * string value which holds the name of the security token key.
      */
-    AUTHENTICATION_MODE_GATEWAY_SECURITY_TOKEN_NAME("authentication.gatewaytoken.name", "hawkbit.server.ddi.security.authentication.gatewaytoken.name", String.class, null, TenantConfigurationStringValidator.class),
+    AUTHENTICATION_MODE_GATEWAY_SECURITY_TOKEN_NAME("authentication.gatewaytoken.name",
+            "hawkbit.server.ddi.security.authentication.gatewaytoken.name", String.class, null,
+            TenantConfigurationStringValidator.class),
 
     /**
      * string value which holds the actual security-key of the gateway security
      * token.
      */
-    AUTHENTICATION_MODE_GATEWAY_SECURITY_TOKEN_KEY("authentication.gatewaytoken.key", "hawkbit.server.ddi.security.authentication.gatewaytoken.key", String.class, null, TenantConfigurationStringValidator.class),
+    AUTHENTICATION_MODE_GATEWAY_SECURITY_TOKEN_KEY("authentication.gatewaytoken.key",
+            "hawkbit.server.ddi.security.authentication.gatewaytoken.key", String.class, null,
+            TenantConfigurationStringValidator.class),
 
     /**
      * string value which holds the polling time interval in the format HH:mm:ss
      */
-    POLLING_TIME_INTERVAL("pollingTime", "hawkbit.controller.pollingTime", String.class, null, TenantConfigurationPollingDurationValidator.class),
+    POLLING_TIME_INTERVAL("pollingTime", "hawkbit.controller.pollingTime", String.class, null,
+            TenantConfigurationPollingDurationValidator.class),
 
     /**
      * string value which holds the polling time interval in the format HH:mm:ss
      */
-    POLLING_OVERDUE_TIME_INTERVAL("pollingOverdueTime", "hawkbit.controller.pollingOverdueTime", String.class, null, TenantConfigurationPollingDurationValidator.class);
+    POLLING_OVERDUE_TIME_INTERVAL("pollingOverdueTime", "hawkbit.controller.pollingOverdueTime", String.class, null,
+            TenantConfigurationPollingDurationValidator.class),
+
+    /**
+     * boolean value {@code true} {@code false}.
+     */
+    ANONYMOUS_DOWNLOAD_MODE_ENABLED("anonymous.download.enabled", "hawkbit.server.download.anonymous.enabled",
+            Boolean.class, Boolean.FALSE.toString(), TenantConfigurationBooleanValidator.class);
 
     private final String keyName;
     private final String defaultKeyName;

hawkbit-dmf-amqp/pom.xml

@@ -25,6 +25,11 @@
          <groupId>org.eclipse.hawkbit</groupId>
          <artifactId>hawkbit-repository</artifactId>
          <version>${project.version}</version>
+      </dependency>
+        <dependency>
+         <groupId>org.eclipse.hawkbit</groupId>
+         <artifactId>hawkbit-core</artifactId>
+         <version>${project.version}</version>
       </dependency>
       <dependency>
          <groupId>org.eclipse.hawkbit</groupId>

hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpControllerAuthentfication.java

@@ -13,12 +13,14 @@ import java.util.List;
 
 import javax.annotation.PostConstruct;
 
-import org.eclipse.hawkbit.dmf.json.model.TenantSecruityToken;
+import org.eclipse.hawkbit.dmf.json.model.TenantSecurityToken;
 import org.eclipse.hawkbit.im.authentication.TenantAwareAuthenticationDetails;
 import org.eclipse.hawkbit.repository.ControllerManagement;
 import org.eclipse.hawkbit.repository.TenantConfigurationManagement;
 import org.eclipse.hawkbit.security.CoapAnonymousPreAuthenticatedFilter;
 import org.eclipse.hawkbit.security.ControllerPreAuthenticateSecurityTokenFilter;
+import org.eclipse.hawkbit.security.ControllerPreAuthenticatedAnonymousDownload;
+import org.eclipse.hawkbit.security.ControllerPreAuthenticatedAnonymousFilter;
 import org.eclipse.hawkbit.security.ControllerPreAuthenticatedGatewaySecurityTokenFilter;
 import org.eclipse.hawkbit.security.ControllerPreAuthenticatedSecurityHeaderFilter;
 import org.eclipse.hawkbit.security.DdiSecurityProperties;
@@ -90,6 +92,11 @@ public class AmqpControllerAuthentfication {
                 tenantConfigurationManagement, controllerManagement, tenantAware, systemSecurityContext);
         filterChain.add(securityTokenFilter);
 
+        final ControllerPreAuthenticatedAnonymousDownload anonymousDownloadFilter = new ControllerPreAuthenticatedAnonymousDownload(
+                tenantConfigurationManagement, tenantAware, systemSecurityContext);
+        filterChain.add(anonymousDownloadFilter);
+
+        filterChain.add(new ControllerPreAuthenticatedAnonymousFilter(ddiSecruityProperties));
         filterChain.add(new CoapAnonymousPreAuthenticatedFilter());
     }
 
@@ -100,7 +107,7 @@ public class AmqpControllerAuthentfication {
      *            the authentication request object
      * @return the authentfication object
      */
-    public Authentication doAuthenticate(final TenantSecruityToken secruityToken) {
+    public Authentication doAuthenticate(final TenantSecurityToken secruityToken) {
         PreAuthenticatedAuthenticationToken authentication = new PreAuthenticatedAuthenticationToken(null, null);
         for (final PreAuthenficationFilter filter : filterChain) {
             final PreAuthenticatedAuthenticationToken authenticationRest = createAuthentication(filter, secruityToken);
@@ -115,7 +122,7 @@ public class AmqpControllerAuthentfication {
     }
 
     private static PreAuthenticatedAuthenticationToken createAuthentication(final PreAuthenficationFilter filter,
-            final TenantSecruityToken secruityToken) {
+            final TenantSecurityToken secruityToken) {
 
         if (!filter.isEnable(secruityToken)) {
             return null;

hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpMessageDispatcherService.java

@@ -14,6 +14,8 @@ import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import org.eclipse.hawkbit.api.ArtifactUrlHandler;
+import org.eclipse.hawkbit.api.UrlProtocol;
 import org.eclipse.hawkbit.dmf.amqp.api.EventTopic;
 import org.eclipse.hawkbit.dmf.amqp.api.MessageHeaderKey;
 import org.eclipse.hawkbit.dmf.amqp.api.MessageType;
@@ -25,7 +27,6 @@ import org.eclipse.hawkbit.eventbus.EventSubscriber;
 import org.eclipse.hawkbit.eventbus.event.CancelTargetAssignmentEvent;
 import org.eclipse.hawkbit.eventbus.event.TargetAssignDistributionSetEvent;
 import org.eclipse.hawkbit.repository.model.LocalArtifact;
-import org.eclipse.hawkbit.util.ArtifactUrlHandler;
 import org.eclipse.hawkbit.util.IpUtil;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.core.MessageProperties;
@@ -152,12 +153,16 @@ public class AmqpMessageDispatcherService extends BaseAmqpService {
 
     private Artifact convertArtifact(final String targetId, final LocalArtifact localArtifact) {
         final Artifact artifact = new Artifact();
+
         artifact.getUrls().put(Artifact.UrlProtocol.COAP,
-                artifactUrlHandler.getUrl(targetId, localArtifact, Artifact.UrlProtocol.COAP));
+                artifactUrlHandler.getUrl(targetId, localArtifact.getSoftwareModule().getId(),
+                        localArtifact.getFilename(), localArtifact.getSha1Hash(), UrlProtocol.COAP));
         artifact.getUrls().put(Artifact.UrlProtocol.HTTP,
-                artifactUrlHandler.getUrl(targetId, localArtifact, Artifact.UrlProtocol.HTTP));
+                artifactUrlHandler.getUrl(targetId, localArtifact.getSoftwareModule().getId(),
+                        localArtifact.getFilename(), localArtifact.getSha1Hash(), UrlProtocol.HTTP));
         artifact.getUrls().put(Artifact.UrlProtocol.HTTPS,
-                artifactUrlHandler.getUrl(targetId, localArtifact, Artifact.UrlProtocol.HTTPS));
+                artifactUrlHandler.getUrl(targetId, localArtifact.getSoftwareModule().getId(),
+                        localArtifact.getFilename(), localArtifact.getSha1Hash(), UrlProtocol.HTTPS));
 
         artifact.setFilename(localArtifact.getFilename());
         artifact.setHashes(new ArtifactHash(localArtifact.getSha1Hash(), null));

hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpMessageHandlerService.java

@@ -28,7 +28,8 @@ import org.eclipse.hawkbit.dmf.json.model.ActionUpdateStatus;
 import org.eclipse.hawkbit.dmf.json.model.Artifact;
 import org.eclipse.hawkbit.dmf.json.model.ArtifactHash;
 import org.eclipse.hawkbit.dmf.json.model.DownloadResponse;
-import org.eclipse.hawkbit.dmf.json.model.TenantSecruityToken;
+import org.eclipse.hawkbit.dmf.json.model.TenantSecurityToken;
+import org.eclipse.hawkbit.dmf.json.model.TenantSecurityToken.FileResource;
 import org.eclipse.hawkbit.eventbus.event.TargetAssignDistributionSetEvent;
 import org.eclipse.hawkbit.im.authentication.SpPermission.SpringEvalExpressions;
 import org.eclipse.hawkbit.im.authentication.TenantAwareAuthenticationDetails;
@@ -157,25 +158,28 @@ public class AmqpMessageHandlerService extends BaseAmqpService {
     private Message handleAuthentifiactionMessage(final Message message) {
         final DownloadResponse authentificationResponse = new DownloadResponse();
         final MessageProperties messageProperties = message.getMessageProperties();
-        final TenantSecruityToken secruityToken = convertMessage(message, TenantSecruityToken.class);
+        final TenantSecurityToken secruityToken = convertMessage(message, TenantSecurityToken.class);
-        final String sha1 = secruityToken.getSha1();
+        final FileResource fileResource = secruityToken.getFileResource();
         try {
             SecurityContextHolder.getContext().setAuthentication(authenticationManager.doAuthenticate(secruityToken));
-            final LocalArtifact localArtifact = artifactManagement
+
-                    .findFirstLocalArtifactsBySHA1(secruityToken.getSha1());
+            final LocalArtifact localArtifact = findLocalArtifactByFileResource(fileResource);
+
             if (localArtifact == null) {
                 throw new EntityNotFoundException();
             }
 
             // check action for this download purposes, the method will throw an
             // EntityNotFoundException in case the controller is not allowed to
-            // download this file
+            // download this file because it's not assigned to an action and not
-            // because it's not assigned to an action and not assigned to this
+            // assigned to this controller. Otherwise no controllerId is set =
-            // controller.
+            // anonymous download
-            final Action action = controllerManagement.getActionForDownloadByTargetAndSoftwareModule(
+            if (secruityToken.getControllerId() != null) {
-                    secruityToken.getControllerId(), localArtifact.getSoftwareModule());
+                final Action action = controllerManagement.getActionForDownloadByTargetAndSoftwareModule(
-            LOG.info("Found action for download authentication request action: {}, sha1: {}", action,
+                        secruityToken.getControllerId(), localArtifact.getSoftwareModule());
-                    secruityToken.getSha1());
+                LOG.info("Found action for download authentication request action: {}, resource: {}", action,
+                        secruityToken.getFileResource());
+            }
 
             final Artifact artifact = convertDbArtifact(artifactManagement.loadLocalArtifactBinary(localArtifact));
             if (artifact == null) {
@@ -183,7 +187,9 @@ public class AmqpMessageHandlerService extends BaseAmqpService {
             }
             authentificationResponse.setArtifact(artifact);
             final String downloadId = UUID.randomUUID().toString();
-            final DownloadArtifactCache downloadCache = new DownloadArtifactCache(DownloadType.BY_SHA1, sha1);
+            // SHA1 key is set, download by SHA1
+            final DownloadArtifactCache downloadCache = new DownloadArtifactCache(DownloadType.BY_SHA1,
+                    localArtifact.getSha1Hash());
             cache.put(downloadId, downloadCache);
             authentificationResponse
                     .setDownloadUrl(UriComponentsBuilder.fromUri(hostnameResolver.resolveHostname().toURI())
@@ -198,7 +204,7 @@ public class AmqpMessageHandlerService extends BaseAmqpService {
             authentificationResponse.setResponseCode(HttpStatus.INTERNAL_SERVER_ERROR.value());
             authentificationResponse.setMessage("Building download URI failed");
         } catch (final EntityNotFoundException e) {
-            final String errorMessage = "Artifact with sha1 " + sha1 + "not found ";
+            final String errorMessage = "Artifact for resource " + fileResource + "not found ";
             LOG.warn(errorMessage, e);
             authentificationResponse.setResponseCode(HttpStatus.NOT_FOUND.value());
             authentificationResponse.setMessage(errorMessage);
@@ -207,6 +213,21 @@ public class AmqpMessageHandlerService extends BaseAmqpService {
         return getMessageConverter().toMessage(authentificationResponse, messageProperties);
     }
 
+    private LocalArtifact findLocalArtifactByFileResource(final FileResource fileResource) {
+        if (fileResource.getSha1() != null) {
+            return artifactManagement.findFirstLocalArtifactsBySHA1(fileResource.getSha1());
+        } else if (fileResource.getFilename() != null) {
+            return artifactManagement.findLocalArtifactByFilename(fileResource.getFilename()).stream().findFirst()
+                    .orElse(null);
+        } else if (fileResource.getSoftwareModuleFilenameResource() != null) {
+            return artifactManagement
+                    .findByFilenameAndSoftwareModule(fileResource.getSoftwareModuleFilenameResource().getFilename(),
+                            fileResource.getSoftwareModuleFilenameResource().getSoftwareModuleId())
+                    .stream().findFirst().orElse(null);
+        }
+        return null;
+    }
+
     private static Artifact convertDbArtifact(final DbArtifact dbArtifact) {
         final Artifact artifact = new Artifact();
         artifact.setSize(dbArtifact.getSize());

hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/util/ArtifactUrlHandler.java

@@ -1,35 +0,0 @@
-/**
- * Copyright (c) 2015 Bosch Software Innovations GmbH and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- */
-package org.eclipse.hawkbit.util;
-
-import org.eclipse.hawkbit.dmf.json.model.Artifact;
-import org.eclipse.hawkbit.repository.model.LocalArtifact;
-
-/**
- * Interface declaration of the {@link ArtifactUrlHandler} which generates the
- * URLs to specific artifacts.
- *
- */
-@FunctionalInterface
-public interface ArtifactUrlHandler {
-
-    /**
-     * Returns a generated URL for a given artifact for a specific protocol.
-     *
-     * @param controllerId
-     *            the authentifacted controller id
-     * @param localArtifact
-     *            the artifact to retrieve a URL to
-     * @param protocol
-     *            the protocol the URL should be generated
-     * @return an URL for the given artifact in a given protocol
-     */
-    String getUrl(String controllerId, LocalArtifact localArtifact, final Artifact.UrlProtocol protocol);
-
-}

hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpControllerAuthenticationTest.java

@@ -19,12 +19,14 @@ import static org.mockito.Mockito.when;
 import org.eclipse.hawkbit.dmf.amqp.api.MessageHeaderKey;
 import org.eclipse.hawkbit.dmf.amqp.api.MessageType;
 import org.eclipse.hawkbit.dmf.json.model.DownloadResponse;
-import org.eclipse.hawkbit.dmf.json.model.TenantSecruityToken;
+import org.eclipse.hawkbit.dmf.json.model.TenantSecurityToken;
+import org.eclipse.hawkbit.dmf.json.model.TenantSecurityToken.FileResource;
 import org.eclipse.hawkbit.repository.ArtifactManagement;
 import org.eclipse.hawkbit.repository.ControllerManagement;
 import org.eclipse.hawkbit.repository.TenantConfigurationManagement;
 import org.eclipse.hawkbit.repository.model.TenantConfigurationValue;
 import org.eclipse.hawkbit.security.DdiSecurityProperties;
+import org.eclipse.hawkbit.security.DdiSecurityProperties.Authentication.Anonymous;
 import org.eclipse.hawkbit.security.DdiSecurityProperties.Rp;
 import org.eclipse.hawkbit.security.SecurityContextTenantAware;
 import org.eclipse.hawkbit.security.SystemSecurityContext;
@@ -79,8 +81,14 @@ public class AmqpControllerAuthenticationTest {
 
         final DdiSecurityProperties secruityProperties = mock(DdiSecurityProperties.class);
         final Rp rp = mock(Rp.class);
+        final org.eclipse.hawkbit.security.DdiSecurityProperties.Authentication ddiAuthentication = mock(
+                org.eclipse.hawkbit.security.DdiSecurityProperties.Authentication.class);
+        final Anonymous anonymous = mock(Anonymous.class);
         when(secruityProperties.getRp()).thenReturn(rp);
         when(rp.getSslIssuerHashHeader()).thenReturn("X-Ssl-Issuer-Hash-%d");
+        when(secruityProperties.getAuthentication()).thenReturn(ddiAuthentication);
+        when(ddiAuthentication.getAnonymous()).thenReturn(anonymous);
+        when(anonymous.isEnabled()).thenReturn(false);
         authenticationManager.setSecruityProperties(secruityProperties);
 
         tenantConfigurationManagement = mock(TenantConfigurationManagement.class);
@@ -105,7 +113,8 @@ public class AmqpControllerAuthenticationTest {
     @Test
     @Description("Tests authentication manager without principal")
     public void testAuthenticationeBadCredantialsWithoutPricipal() {
-        final TenantSecruityToken securityToken = new TenantSecruityToken(TENANT, CONTROLLLER_ID, "12345");
+        final TenantSecurityToken securityToken = new TenantSecurityToken(TENANT, CONTROLLLER_ID,
+                FileResource.sha1("12345"));
         try {
             authenticationManager.doAuthenticate(securityToken);
             fail("BadCredentialsException was excepeted since principal was missing");
@@ -118,11 +127,12 @@ public class AmqpControllerAuthenticationTest {
     @Test
     @Description("Tests authentication manager without wrong credential")
     public void testAuthenticationBadCredantialsWithWrongCredential() {
-        final TenantSecruityToken securityToken = new TenantSecruityToken(TENANT, CONTROLLLER_ID, "12345");
+        final TenantSecurityToken securityToken = new TenantSecurityToken(TENANT, CONTROLLLER_ID,
+                FileResource.sha1("12345"));
         when(tenantConfigurationManagement.getConfigurationValue(
                 eq(TenantConfigurationKey.AUTHENTICATION_MODE_TARGET_SECURITY_TOKEN_ENABLED), eq(Boolean.class)))
                         .thenReturn(CONFIG_VALUE_TRUE);
-        securityToken.getHeaders().put(TenantSecruityToken.AUTHORIZATION_HEADER, "TargetToken 12" + CONTROLLLER_ID);
+        securityToken.getHeaders().put(TenantSecurityToken.AUTHORIZATION_HEADER, "TargetToken 12" + CONTROLLLER_ID);
         try {
             authenticationManager.doAuthenticate(securityToken);
             fail("BadCredentialsException was excepeted due to wrong credential");
@@ -135,11 +145,12 @@ public class AmqpControllerAuthenticationTest {
     @Test
     @Description("Tests authentication successfull")
     public void testSuccessfullAuthentication() {
-        final TenantSecruityToken securityToken = new TenantSecruityToken(TENANT, CONTROLLLER_ID, "12345");
+        final TenantSecurityToken securityToken = new TenantSecurityToken(TENANT, CONTROLLLER_ID,
+                FileResource.sha1("12345"));
         when(tenantConfigurationManagement.getConfigurationValue(
                 eq(TenantConfigurationKey.AUTHENTICATION_MODE_TARGET_SECURITY_TOKEN_ENABLED), eq(Boolean.class)))
                         .thenReturn(CONFIG_VALUE_TRUE);
-        securityToken.getHeaders().put(TenantSecruityToken.AUTHORIZATION_HEADER, "TargetToken " + CONTROLLLER_ID);
+        securityToken.getHeaders().put(TenantSecurityToken.AUTHORIZATION_HEADER, "TargetToken " + CONTROLLLER_ID);
         final Authentication authentication = authenticationManager.doAuthenticate(securityToken);
         assertThat(authentication).isNotNull();
     }
@@ -149,7 +160,8 @@ public class AmqpControllerAuthenticationTest {
     public void testAuthenticationMessageBadCredantialsWithoutPricipal() {
         final MessageProperties messageProperties = createMessageProperties(MessageType.AUTHENTIFICATION);
 
-        final TenantSecruityToken securityToken = new TenantSecruityToken(TENANT, CONTROLLLER_ID, "12345");
+        final TenantSecurityToken securityToken = new TenantSecurityToken(TENANT, CONTROLLLER_ID,
+                FileResource.sha1("12345"));
         final Message message = amqpMessageHandlerService.getMessageConverter().toMessage(securityToken,
                 messageProperties);
 
@@ -167,11 +179,12 @@ public class AmqpControllerAuthenticationTest {
     @Description("Tests authentication message without wrong credential")
     public void testAuthenticationMessageBadCredantialsWithWrongCredential() {
         final MessageProperties messageProperties = createMessageProperties(MessageType.AUTHENTIFICATION);
-        final TenantSecruityToken securityToken = new TenantSecruityToken(TENANT, CONTROLLLER_ID, "12345");
+        final TenantSecurityToken securityToken = new TenantSecurityToken(TENANT, CONTROLLLER_ID,
+                FileResource.sha1("12345"));
         when(tenantConfigurationManagement.getConfigurationValue(
                 eq(TenantConfigurationKey.AUTHENTICATION_MODE_TARGET_SECURITY_TOKEN_ENABLED), eq(Boolean.class)))
                         .thenReturn(CONFIG_VALUE_TRUE);
-        securityToken.getHeaders().put(TenantSecruityToken.AUTHORIZATION_HEADER, "TargetToken 12" + CONTROLLLER_ID);
+        securityToken.getHeaders().put(TenantSecurityToken.AUTHORIZATION_HEADER, "TargetToken 12" + CONTROLLLER_ID);
         final Message message = amqpMessageHandlerService.getMessageConverter().toMessage(securityToken,
                 messageProperties);
 
@@ -189,11 +202,12 @@ public class AmqpControllerAuthenticationTest {
     @Description("Tests authentication message successfull")
     public void testSuccessfullMessageAuthentication() {
         final MessageProperties messageProperties = createMessageProperties(MessageType.AUTHENTIFICATION);
-        final TenantSecruityToken securityToken = new TenantSecruityToken(TENANT, CONTROLLLER_ID, "12345");
+        final TenantSecurityToken securityToken = new TenantSecurityToken(TENANT, CONTROLLLER_ID,
+                FileResource.sha1("12345"));
         when(tenantConfigurationManagement.getConfigurationValue(
                 eq(TenantConfigurationKey.AUTHENTICATION_MODE_TARGET_SECURITY_TOKEN_ENABLED), eq(Boolean.class)))
                         .thenReturn(CONFIG_VALUE_TRUE);
-        securityToken.getHeaders().put(TenantSecruityToken.AUTHORIZATION_HEADER, "TargetToken " + CONTROLLLER_ID);
+        securityToken.getHeaders().put(TenantSecurityToken.AUTHORIZATION_HEADER, "TargetToken " + CONTROLLLER_ID);
         final Message message = amqpMessageHandlerService.getMessageConverter().toMessage(securityToken,
                 messageProperties);
 

hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpMessageDispatcherServiceTest.java

@@ -13,6 +13,7 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyLong;
 import static org.mockito.Matchers.anyObject;
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Matchers.eq;
@@ -25,6 +26,7 @@ import java.util.List;
 
 import org.eclipse.hawkbit.AbstractIntegrationTestWithMongoDB;
 import org.eclipse.hawkbit.TestDataUtil;
+import org.eclipse.hawkbit.api.ArtifactUrlHandler;
 import org.eclipse.hawkbit.artifact.repository.model.DbArtifact;
 import org.eclipse.hawkbit.dmf.amqp.api.EventTopic;
 import org.eclipse.hawkbit.dmf.amqp.api.MessageHeaderKey;
@@ -36,7 +38,6 @@ import org.eclipse.hawkbit.repository.model.Artifact;
 import org.eclipse.hawkbit.repository.model.DistributionSet;
 import org.eclipse.hawkbit.repository.model.LocalArtifact;
 import org.eclipse.hawkbit.repository.model.SoftwareModule;
-import org.eclipse.hawkbit.util.ArtifactUrlHandler;
 import org.eclipse.hawkbit.util.IpUtil;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
@@ -77,7 +78,8 @@ public class AmqpMessageDispatcherServiceTest extends AbstractIntegrationTestWit
         amqpMessageDispatcherService.setAmqpSenderService(senderService);
 
         final ArtifactUrlHandler artifactUrlHandlerMock = Mockito.mock(ArtifactUrlHandler.class);
-        when(artifactUrlHandlerMock.getUrl(anyString(), any(), anyObject())).thenReturn("http://mockurl");
+        when(artifactUrlHandlerMock.getUrl(anyString(), anyLong(), anyString(), anyString(), anyObject()))
+                .thenReturn("http://mockurl");
 
         amqpMessageDispatcherService.setArtifactUrlHandler(artifactUrlHandlerMock);
 

hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpMessageHandlerServiceTest.java

@@ -34,7 +34,8 @@ import org.eclipse.hawkbit.dmf.amqp.api.MessageType;
 import org.eclipse.hawkbit.dmf.json.model.ActionStatus;
 import org.eclipse.hawkbit.dmf.json.model.ActionUpdateStatus;
 import org.eclipse.hawkbit.dmf.json.model.DownloadResponse;
-import org.eclipse.hawkbit.dmf.json.model.TenantSecruityToken;
+import org.eclipse.hawkbit.dmf.json.model.TenantSecurityToken;
+import org.eclipse.hawkbit.dmf.json.model.TenantSecurityToken.FileResource;
 import org.eclipse.hawkbit.eventbus.event.TargetAssignDistributionSetEvent;
 import org.eclipse.hawkbit.repository.ArtifactManagement;
 import org.eclipse.hawkbit.repository.ControllerManagement;
@@ -263,7 +264,7 @@ public class AmqpMessageHandlerServiceTest {
     @Description("Tests that an download request is denied for an artifact which does not exists")
     public void authenticationRequestDeniedForArtifactWhichDoesNotExists() {
         final MessageProperties messageProperties = createMessageProperties(MessageType.AUTHENTIFICATION);
-        final TenantSecruityToken securityToken = new TenantSecruityToken(TENANT, "123", "12345");
+        final TenantSecurityToken securityToken = new TenantSecurityToken(TENANT, "123", FileResource.sha1("12345"));
         final Message message = amqpMessageHandlerService.getMessageConverter().toMessage(securityToken,
                 messageProperties);
 
@@ -282,7 +283,7 @@ public class AmqpMessageHandlerServiceTest {
     @Description("Tests that an download request is denied for an artifact which is not assigned to the requested target")
     public void authenticationRequestDeniedForArtifactWhichIsNotAssignedToTarget() {
         final MessageProperties messageProperties = createMessageProperties(MessageType.AUTHENTIFICATION);
-        final TenantSecruityToken securityToken = new TenantSecruityToken(TENANT, "123", "12345");
+        final TenantSecurityToken securityToken = new TenantSecurityToken(TENANT, "123", FileResource.sha1("12345"));
         final Message message = amqpMessageHandlerService.getMessageConverter().toMessage(securityToken,
                 messageProperties);
 
@@ -306,7 +307,7 @@ public class AmqpMessageHandlerServiceTest {
     @Description("Tests that an download request is allowed for an artifact which exists and assigned to the requested target")
     public void authenticationRequestAllowedForArtifactWhichExistsAndAssignedToTarget() throws MalformedURLException {
         final MessageProperties messageProperties = createMessageProperties(MessageType.AUTHENTIFICATION);
-        final TenantSecruityToken securityToken = new TenantSecruityToken(TENANT, "123", "12345");
+        final TenantSecurityToken securityToken = new TenantSecurityToken(TENANT, "123", FileResource.sha1("12345"));
         final Message message = amqpMessageHandlerService.getMessageConverter().toMessage(securityToken,
                 messageProperties);
 

hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/util/PropertyBasedArtifactUrlHandlerTest.java

@@ -15,7 +15,8 @@ import org.eclipse.hawkbit.AmqpTestConfiguration;
 import org.eclipse.hawkbit.RepositoryApplicationConfiguration;
 import org.eclipse.hawkbit.TestConfiguration;
 import org.eclipse.hawkbit.TestDataUtil;
-import org.eclipse.hawkbit.dmf.json.model.Artifact;
+import org.eclipse.hawkbit.api.ArtifactUrlHandler;
+import org.eclipse.hawkbit.api.UrlProtocol;
 import org.eclipse.hawkbit.repository.model.DistributionSet;
 import org.eclipse.hawkbit.repository.model.LocalArtifact;
 import org.eclipse.hawkbit.repository.model.SoftwareModule;
@@ -30,8 +31,7 @@ import ru.yandex.qatools.allure.annotations.Features;
 import ru.yandex.qatools.allure.annotations.Stories;
 
 /**
- *
+ * Tests for creating urls to download artifacts.
- *
  */
 @Features("Component Tests - Artifact URL Handler")
 @Stories("Test to generate the artifact download URL")
@@ -45,6 +45,9 @@ public class PropertyBasedArtifactUrlHandlerTest extends AbstractIntegrationTest
     private TenantAware tenantAware;
     private LocalArtifact localArtifact;
     private final String controllerId = "Test";
+    private String fileName;
+    private Long softwareModuleId;
+    private String sha1Hash;
 
     @Before
     public void setup() {
@@ -53,12 +56,18 @@ public class PropertyBasedArtifactUrlHandlerTest extends AbstractIntegrationTest
         final SoftwareModule module = dsA.getModules().iterator().next();
         localArtifact = (LocalArtifact) TestDataUtil.generateArtifacts(artifactManagement, module.getId()).stream()
                 .findAny().get();
+        softwareModuleId = localArtifact.getSoftwareModule().getId();
+        fileName = localArtifact.getFilename();
+        sha1Hash = localArtifact.getSha1Hash();
+
     }
 
     @Test
     @Description("Tests the generation of http download url.")
     public void testHttpUrl() {
-        final String url = urlHandlerProperties.getUrl(controllerId, localArtifact, Artifact.UrlProtocol.HTTP);
+
+        final String url = urlHandlerProperties.getUrl(controllerId, softwareModuleId, fileName, sha1Hash,
+                UrlProtocol.HTTP);
         assertEquals("http is build incorrect",
                 "http://localhost/" + tenantAware.getCurrentTenant() + "/controller/v1/" + controllerId
                         + "/softwaremodules/" + localArtifact.getSoftwareModule().getId() + "/artifacts/"
@@ -69,7 +78,8 @@ public class PropertyBasedArtifactUrlHandlerTest extends AbstractIntegrationTest
     @Test
     @Description("Tests the generation of https download url.")
     public void testHttpsUrl() {
-        final String url = urlHandlerProperties.getUrl(controllerId, localArtifact, Artifact.UrlProtocol.HTTPS);
+        final String url = urlHandlerProperties.getUrl(controllerId, softwareModuleId, fileName, sha1Hash,
+                UrlProtocol.HTTPS);
         assertEquals("https is build incorrect",
                 "https://localhost/" + tenantAware.getCurrentTenant() + "/controller/v1/" + controllerId
                         + "/softwaremodules/" + localArtifact.getSoftwareModule().getId() + "/artifacts/"
@@ -80,7 +90,8 @@ public class PropertyBasedArtifactUrlHandlerTest extends AbstractIntegrationTest
     @Test
     @Description("Tests the generation of coap download url.")
     public void testCoapUrl() {
-        final String url = urlHandlerProperties.getUrl(controllerId, localArtifact, Artifact.UrlProtocol.COAP);
+        final String url = urlHandlerProperties.getUrl(controllerId, softwareModuleId, fileName, sha1Hash,
+                UrlProtocol.COAP);
 
         assertEquals("coap is build incorrect", "coap://127.0.0.1:5683/fw/" + tenantAware.getCurrentTenant() + "/"
                 + controllerId + "/sha1/" + localArtifact.getSha1Hash(), url);

hawkbit-dmf-api/src/main/java/org/eclipse/hawkbit/dmf/json/model/TenantSecruityToken.java

@@ -1,94 +0,0 @@
-/**
- * Copyright (c) 2015 Bosch Software Innovations GmbH and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- */
-package org.eclipse.hawkbit.dmf.json.model;
-
-import java.util.Map;
-import java.util.TreeMap;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonInclude.Include;
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-/**
- * JSON representation to authenticate a tenant.
- * 
- *
- *
- */
-
-@JsonInclude(Include.NON_NULL)
-@JsonIgnoreProperties(ignoreUnknown = true)
-public class TenantSecruityToken {
-
-    public static final String AUTHORIZATION_HEADER = "Authorization";
-    public static final String COAP_AUTHORIZATION_HEADER = "Coap-Authorization";
-    public static final String COAP_TOKEN_VALUE = "CoapToken";
-
-    @JsonProperty
-    private final String tenant;
-    @JsonProperty
-    private final String controllerId;
-    @JsonProperty(required = false)
-    private Map<String, String> headers = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
-    @JsonProperty(required = false)
-    private final String sha1;
-
-    /**
-     * Constructor.
-     * 
-     * @param tenant
-     *            the tenant for the security token
-     * @param controllerId
-     *            the ID of the controller for the security token
-     * @param sha1
-     *            the sha1 of authentication
-     */
-    @JsonCreator
-    public TenantSecruityToken(@JsonProperty("tenant") final String tenant,
-            @JsonProperty("controllerId") final String controllerId, @JsonProperty("sha1") final String sha1) {
-        this.tenant = tenant;
-        this.controllerId = controllerId;
-        this.sha1 = sha1;
-    }
-
-    public String getTenant() {
-        return tenant;
-    }
-
-    public String getControllerId() {
-        return controllerId;
-    }
-
-    public Map<String, String> getHeaders() {
-        return headers;
-    }
-
-    public String getSha1() {
-        return sha1;
-    }
-
-    /**
-     * Gets a header value.
-     * 
-     * @param name
-     *            of header
-     * @return the value
-     */
-    public String getHeader(final String name) {
-        return headers.get(name);
-    }
-
-    public void setHeaders(final Map<String, String> headers) {
-        this.headers = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
-        this.headers.putAll(headers);
-    }
-
-}

hawkbit-dmf-api/src/main/java/org/eclipse/hawkbit/dmf/json/model/TenantSecurityToken.java

@@ -0,0 +1,226 @@
+/**
+ * Copyright (c) 2015 Bosch Software Innovations GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
+package org.eclipse.hawkbit.dmf.json.model;
+
+import java.util.Map;
+import java.util.TreeMap;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * JSON representation to authenticate a tenant.
+ */
+
+@JsonInclude(Include.NON_NULL)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class TenantSecurityToken {
+
+    public static final String AUTHORIZATION_HEADER = "Authorization";
+    public static final String COAP_AUTHORIZATION_HEADER = "Coap-Authorization";
+    public static final String COAP_TOKEN_VALUE = "CoapToken";
+
+    @JsonProperty
+    private final String tenant;
+    @JsonProperty
+    private final String controllerId;
+    @JsonProperty(required = false)
+    private Map<String, String> headers = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
+
+    @JsonProperty(required = false)
+    private final FileResource fileResource;
+
+    /**
+     * Constructor.
+     * 
+     * @param tenant
+     *            the tenant for the security token
+     * @param controllerId
+     *            the ID of the controller for the security token
+     * @param fileResource
+     *            the file to obtain
+     */
+    @JsonCreator
+    public TenantSecurityToken(@JsonProperty("tenant") final String tenant,
+            @JsonProperty("controllerId") final String controllerId,
+            @JsonProperty("fileResource") final FileResource fileResource) {
+        this.tenant = tenant;
+        this.controllerId = controllerId;
+        this.fileResource = fileResource;
+    }
+
+    public String getTenant() {
+        return tenant;
+    }
+
+    public String getControllerId() {
+        return controllerId;
+    }
+
+    public Map<String, String> getHeaders() {
+        return headers;
+    }
+
+    public FileResource getFileResource() {
+        return fileResource;
+    }
+
+    /**
+     * Gets a header value.
+     * 
+     * @param name
+     *            of header
+     * @return the value
+     */
+    public String getHeader(final String name) {
+        return headers.get(name);
+    }
+
+    public void setHeaders(final Map<String, String> headers) {
+        this.headers = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
+        this.headers.putAll(headers);
+    }
+
+    /**
+     * File resource descriptor which is used to ask for the resource to
+     * download e.g. The lookup of the file can be different e.g. by SHA1 hash
+     * or by filename.
+     */
+    @JsonInclude(Include.NON_NULL)
+    @JsonIgnoreProperties(ignoreUnknown = true)
+    public static class FileResource {
+        @JsonProperty(required = false)
+        private String sha1;
+        @JsonProperty(required = false)
+        private String filename;
+        @JsonProperty(required = false)
+        private SoftwareModuleFilenameResource softwareModuleFilenameResource;
+
+        public String getSha1() {
+            return sha1;
+        }
+
+        public void setSha1(final String sha1) {
+            this.sha1 = sha1;
+        }
+
+        public String getFilename() {
+            return filename;
+        }
+
+        public void setFilename(final String filename) {
+            this.filename = filename;
+        }
+
+        public SoftwareModuleFilenameResource getSoftwareModuleFilenameResource() {
+            return softwareModuleFilenameResource;
+        }
+
+        public void setSoftwareModuleFilenameResource(
+                final SoftwareModuleFilenameResource softwareModuleFilenameResource) {
+            this.softwareModuleFilenameResource = softwareModuleFilenameResource;
+        }
+
+        /**
+         * factory method to create a file resource for an SHA1 lookup.
+         * 
+         * @param sha1
+         *            the SHA1 key of the file to obtain
+         * @return the {@link FileResource} with SHA1 key set
+         */
+        public static FileResource sha1(final String sha1) {
+            final FileResource resource = new FileResource();
+            resource.sha1 = sha1;
+            return resource;
+        }
+
+        /**
+         * factory method to create a file resource for an filename lookup.
+         * 
+         * @param filename
+         *            the filename of the file to obtain
+         * @return the {@link FileResource} with filename set
+         */
+        public static FileResource filename(final String filename) {
+            final FileResource resource = new FileResource();
+            resource.filename = filename;
+            return resource;
+        }
+
+        /**
+         * factory method to create a file resource for an softwaremodule +
+         * filename lookup, because an filename is not globally unique but
+         * within a softwaremodule.
+         * 
+         * @param softwareModuleId
+         *            the ID of the software module which contains the artifact
+         * @param filename
+         *            the name of file to obtain within the software module
+         * @return the {@link FileResource} with artifactId set
+         */
+        public static FileResource softwareModuleFilename(final Long softwareModuleId, final String filename) {
+            final FileResource resource = new FileResource();
+            resource.softwareModuleFilenameResource = new SoftwareModuleFilenameResource(softwareModuleId, filename);
+            return resource;
+        }
+
+        @Override
+        public String toString() {
+            return "FileResource [sha1=" + sha1 + ", filename=" + filename + "]";
+        }
+
+        /**
+         * Inner class which holds the pointer to an artifact based on the
+         * softwaremoduleId and the filename.
+         */
+        @JsonInclude(Include.NON_NULL)
+        @JsonIgnoreProperties(ignoreUnknown = true)
+        public static class SoftwareModuleFilenameResource {
+            @JsonProperty(required = false)
+            private Long softwareModuleId;
+            @JsonProperty(required = false)
+            private String filename;
+
+            /**
+             * Constructor.
+             * 
+             * @param softwareModuleId
+             *            the ID of the softwaremodule
+             * @param filename
+             *            the name of the file of the artifact within the
+             *            softwaremodule
+             */
+            @JsonCreator
+            public SoftwareModuleFilenameResource(@JsonProperty("softwareModuleId") final Long softwareModuleId,
+                    @JsonProperty("filename") final String filename) {
+                this.softwareModuleId = softwareModuleId;
+                this.filename = filename;
+            }
+
+            public Long getSoftwareModuleId() {
+                return softwareModuleId;
+            }
+
+            public String getFilename() {
+                return filename;
+            }
+
+            public void setSoftwareModuleId(final Long softwareModuleId) {
+                this.softwareModuleId = softwareModuleId;
+            }
+
+            public void setFilename(final String filename) {
+                this.filename = filename;
+            }
+        }
+    }
+}

hawkbit-http-security/src/main/java/org/eclipse/hawkbit/security/AbstractHttpControllerAuthenticationFilter.java

@@ -9,6 +9,8 @@
 package org.eclipse.hawkbit.security;
 
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Map;
 
 import javax.servlet.FilterChain;
@@ -16,14 +18,19 @@ import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
-import org.eclipse.hawkbit.dmf.json.model.TenantSecruityToken;
+import org.eclipse.hawkbit.dmf.json.model.TenantSecurityToken;
+import org.eclipse.hawkbit.dmf.json.model.TenantSecurityToken.FileResource;
 import org.eclipse.hawkbit.repository.TenantConfigurationManagement;
 import org.eclipse.hawkbit.tenancy.TenantAware;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.web.authentication.preauth.AbstractPreAuthenticatedProcessingFilter;
+import org.springframework.security.web.authentication.preauth.PreAuthenticatedAuthenticationToken;
 import org.springframework.util.AntPathMatcher;
 
 import com.google.common.collect.Iterators;
@@ -79,14 +86,6 @@ public abstract class AbstractHttpControllerAuthenticationFilter extends Abstrac
         pathExtractor = new AntPathMatcher();
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.springframework.security.web.authentication.preauth.
-     * AbstractPreAuthenticatedProcessingFilter
-     * #doFilter(javax.servlet.ServletRequest, javax.servlet.ServletResponse,
-     * javax.servlet.FilterChain)
-     */
     @Override
     public void doFilter(final ServletRequest request, final ServletResponse response, final FilterChain chain)
             throws IOException, ServletException {
@@ -96,7 +95,7 @@ public abstract class AbstractHttpControllerAuthenticationFilter extends Abstrac
             return;
         }
 
-        final TenantSecruityToken secruityToken = createTenantSecruityTokenVariables((HttpServletRequest) request);
+        final TenantSecurityToken secruityToken = createTenantSecruityTokenVariables((HttpServletRequest) request);
         if (secruityToken == null) {
             chain.doFilter(request, response);
             return;
@@ -112,6 +111,18 @@ public abstract class AbstractHttpControllerAuthenticationFilter extends Abstrac
 
     protected abstract PreAuthenficationFilter createControllerAuthenticationFilter();
 
+    @Override
+    protected void successfulAuthentication(final HttpServletRequest request, final HttpServletResponse response,
+            final Authentication authResult) {
+        final Collection<GrantedAuthority> authorities = new ArrayList<>();
+        authorities.addAll(authResult.getAuthorities());
+        authorities.addAll(abstractControllerAuthenticationFilter.getSuccessfulAuthenticationAuthorities());
+        final PreAuthenticatedAuthenticationToken authTokenWithGrantedAuthorities = new PreAuthenticatedAuthenticationToken(
+                authResult.getPrincipal(), authResult.getCredentials(), authorities);
+        authTokenWithGrantedAuthorities.setDetails(authResult.getDetails());
+        super.successfulAuthentication(request, response, authTokenWithGrantedAuthorities);
+    }
+
     /**
      * Extracts tenant and controllerId from the request URI as path variables.
      * 
@@ -121,7 +132,7 @@ public abstract class AbstractHttpControllerAuthenticationFilter extends Abstrac
      *         request does not match the pattern and no variables could be
      *         extracted
      */
-    protected TenantSecruityToken createTenantSecruityTokenVariables(final HttpServletRequest request) {
+    protected TenantSecurityToken createTenantSecruityTokenVariables(final HttpServletRequest request) {
         final String requestURI = request.getRequestURI();
 
         if (pathExtractor.match(request.getContextPath() + CONTROLLER_REQUEST_ANT_PATTERN, requestURI)) {
@@ -153,9 +164,9 @@ public abstract class AbstractHttpControllerAuthenticationFilter extends Abstrac
         }
     }
 
-    private TenantSecruityToken createTenantSecruityTokenVariables(final HttpServletRequest request,
+    private TenantSecurityToken createTenantSecruityTokenVariables(final HttpServletRequest request,
             final String tenant, final String controllerId) {
-        final TenantSecruityToken secruityToken = new TenantSecruityToken(tenant, controllerId, "");
+        final TenantSecurityToken secruityToken = new TenantSecurityToken(tenant, controllerId, FileResource.sha1(""));
         final UnmodifiableIterator<String> forEnumeration = Iterators.forEnumeration(request.getHeaderNames());
         forEnumeration.forEachRemaining(header -> secruityToken.getHeaders().put(header, request.getHeader(header)));
         return secruityToken;
@@ -163,7 +174,7 @@ public abstract class AbstractHttpControllerAuthenticationFilter extends Abstrac
 
     @Override
     protected Object getPreAuthenticatedPrincipal(final HttpServletRequest request) {
-        final TenantSecruityToken secruityToken = createTenantSecruityTokenVariables(request);
+        final TenantSecurityToken secruityToken = createTenantSecruityTokenVariables(request);
         if (secruityToken == null) {
             return null;
         }
@@ -172,7 +183,7 @@ public abstract class AbstractHttpControllerAuthenticationFilter extends Abstrac
 
     @Override
     protected Object getPreAuthenticatedCredentials(final HttpServletRequest request) {
-        final TenantSecruityToken secruityToken = createTenantSecruityTokenVariables(request);
+        final TenantSecurityToken secruityToken = createTenantSecruityTokenVariables(request);
         if (secruityToken == null) {
             return null;
         }

hawkbit-http-security/src/main/java/org/eclipse/hawkbit/security/HttpControllerPreAuthenticateAnonymousDownloadFilter.java

@@ -0,0 +1,47 @@
+/**
+ * Copyright (c) 2015 Bosch Software Innovations GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
+package org.eclipse.hawkbit.security;
+
+import org.eclipse.hawkbit.im.authentication.SpPermission.SpringEvalExpressions;
+import org.eclipse.hawkbit.repository.TenantConfigurationManagement;
+import org.eclipse.hawkbit.tenancy.TenantAware;
+
+/**
+ * An pre-authenticated processing filter which add the
+ * {@link SpringEvalExpressions#CONTROLLER_DOWNLOAD_ROLE_ANONYMOUS} to the
+ * security context in case the anonymous download is allowed through
+ * configuration.
+ */
+public class HttpControllerPreAuthenticateAnonymousDownloadFilter extends AbstractHttpControllerAuthenticationFilter {
+
+    /**
+     * Constructor.
+     * 
+     * @param tenantConfigurationManagement
+     *            the system management service to retrieve configuration
+     *            properties
+     * @param tenantAware
+     *            the tenant aware service to get configuration for the specific
+     *            tenant
+     * @param systemSecurityContext
+     *            the system security context
+     */
+    public HttpControllerPreAuthenticateAnonymousDownloadFilter(
+            final TenantConfigurationManagement tenantConfigurationManagement, final TenantAware tenantAware,
+            final SystemSecurityContext systemSecurityContext) {
+        super(tenantConfigurationManagement, tenantAware, systemSecurityContext);
+    }
+
+    @Override
+    protected PreAuthenficationFilter createControllerAuthenticationFilter() {
+        return new ControllerPreAuthenticatedAnonymousDownload(tenantConfigurationManagement, tenantAware,
+                systemSecurityContext);
+    }
+
+}

hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/ArtifactManagement.java

@@ -321,7 +321,8 @@ public class ArtifactManagement {
         }
 
         boolean artifactIsOnlyUsedByOneSoftwareModule = true;
-        for (LocalArtifact lArtifact : localArtifactRepository.findByGridFsFileName(existing.getGridFsFileName())) {
+        for (final LocalArtifact lArtifact : localArtifactRepository
+                .findByGridFsFileName(existing.getGridFsFileName())) {
             if (!lArtifact.getSoftwareModule().isDeleted()
                     && lArtifact.getSoftwareModule().getId() != existing.getSoftwareModule().getId()) {
                 artifactIsOnlyUsedByOneSoftwareModule = false;
@@ -403,7 +404,7 @@ public class ArtifactManagement {
      *             if file could not be found in store
      */
     @PreAuthorize(SpringEvalExpressions.HAS_AUTH_DOWNLOAD_ARTIFACT + SpringEvalExpressions.HAS_AUTH_OR
-            + SpringEvalExpressions.IS_CONTROLLER)
+            + SpringEvalExpressions.HAS_CONTROLLER_DOWNLOAD)
     public DbArtifact loadLocalArtifactBinary(@NotNull final LocalArtifact artifact) {
         final DbArtifact result = artifactRepository.getArtifactBySha1(artifact.getGridFsFileName());
         if (result == null) {

hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/model/DistributionSetMetadata.java

@@ -8,10 +8,6 @@
  */
 package org.eclipse.hawkbit.repository.model;
 
-import java.io.Serializable;
-
-import javax.persistence.Basic;
-import javax.persistence.Column;
 import javax.persistence.ConstraintMode;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
@@ -29,63 +25,31 @@ import javax.persistence.Table;
 @IdClass(DsMetadataCompositeKey.class)
 @Entity
 @Table(name = "sp_ds_metadata")
-public class DistributionSetMetadata implements Serializable {
+public class DistributionSetMetadata extends MetaData {
     private static final long serialVersionUID = 1L;
 
-    @Id
-    @Column(name = "meta_key", length = 128)
-    private String key;
-
-    @Column(name = "meta_value", length = 4000)
-    @Basic
-    private String value;
-
     @Id
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "ds_id", foreignKey = @ForeignKey(value = ConstraintMode.CONSTRAINT, name = "fk_metadata_ds"))
     private DistributionSet distributionSet;
 
     public DistributionSetMetadata() {
-        // Default constructor for JPA.
+        // default public constructor for JPA
     }
 
-    /**
-     * Parameter constructor.
-     *
-     * @param key
-     * @param distributionSet
-     * @param value
-     */
     public DistributionSetMetadata(final String key, final DistributionSet distributionSet, final String value) {
-        this.key = key;
+        super(key, value);
         this.distributionSet = distributionSet;
-        this.value = value;
     }
 
     public DsMetadataCompositeKey getId() {
-        return new DsMetadataCompositeKey(distributionSet, key);
+        return new DsMetadataCompositeKey(distributionSet, getKey());
-    }
-
-    public String getKey() {
-        return key;
-    }
-
-    public void setKey(final String key) {
-        this.key = key;
     }
 
     public void setDistributionSet(final DistributionSet distributionSet) {
         this.distributionSet = distributionSet;
     }
 
-    public String getValue() {
-        return value;
-    }
-
-    public void setValue(final String value) {
-        this.value = value;
-    }
-
     public DistributionSet getDistributionSet() {
         return distributionSet;
     }
@@ -93,21 +57,14 @@ public class DistributionSetMetadata implements Serializable {
     @Override
     public int hashCode() {
         final int prime = 31;
-        int result = 1;
+        int result = super.hashCode();
-        result = prime * result + (distributionSet == null ? 0 : distributionSet.hashCode());
+        result = prime * result + ((distributionSet == null) ? 0 : distributionSet.hashCode());
-        result = prime * result + (key == null ? 0 : key.hashCode());
         return result;
     }
 
     @Override
     public boolean equals(final Object obj) {
-        if (this == obj) {
+        if (!super.equals(obj)) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (!(obj instanceof DistributionSetMetadata)) {
             return false;
         }
         final DistributionSetMetadata other = (DistributionSetMetadata) obj;
@@ -118,14 +75,6 @@ public class DistributionSetMetadata implements Serializable {
         } else if (!distributionSet.equals(other.distributionSet)) {
             return false;
         }
-        if (key == null) {
-            if (other.key != null) {
-                return false;
-            }
-        } else if (!key.equals(other.key)) {
-            return false;
-        }
         return true;
     }
-
 }

hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/model/MetaData.java

@@ -0,0 +1,98 @@
+/**
+ * Copyright (c) 2015 Bosch Software Innovations GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
+package org.eclipse.hawkbit.repository.model;
+
+import java.io.Serializable;
+
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Id;
+import javax.persistence.MappedSuperclass;
+
+/**
+ * Meta data for entities.
+ *
+ */
+@MappedSuperclass
+public abstract class MetaData implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @Column(name = "meta_key", length = 128)
+    private String key;
+
+    @Column(name = "meta_value", length = 4000)
+    @Basic
+    private String value;
+
+    public MetaData(final String key, final String value) {
+        super();
+        this.key = key;
+        this.value = value;
+    }
+
+    public MetaData() {
+        // Default constructor needed for JPA entities
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(final String key) {
+        this.key = key;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(final String value) {
+        this.value = value;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((key == null) ? 0 : key.hashCode());
+        result = prime * result + ((value == null) ? 0 : value.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(final Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (!(this.getClass().isInstance(obj))) {
+            return false;
+        }
+        final MetaData other = (MetaData) obj;
+        if (key == null) {
+            if (other.key != null) {
+                return false;
+            }
+        } else if (!key.equals(other.key)) {
+            return false;
+        }
+        if (value == null) {
+            if (other.value != null) {
+                return false;
+            }
+        } else if (!value.equals(other.value)) {
+            return false;
+        }
+        return true;
+    }
+
+}

hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/model/SoftwareModuleMetadata.java

@@ -8,9 +8,6 @@
  */
 package org.eclipse.hawkbit.repository.model;
 
-import java.io.Serializable;
-
-import javax.persistence.Column;
 import javax.persistence.ConstraintMode;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
@@ -28,53 +25,25 @@ import javax.persistence.Table;
 @IdClass(SwMetadataCompositeKey.class)
 @Entity
 @Table(name = "sp_sw_metadata")
-public class SoftwareModuleMetadata implements Serializable {
+public class SoftwareModuleMetadata extends MetaData {
     private static final long serialVersionUID = 1L;
 
-    @Id
-    @Column(name = "meta_key", length = 128)
-    private String key;
-
-    @Column(name = "meta_value", length = 4000)
-    private String value;
-
     @Id
     @ManyToOne(targetEntity = SoftwareModule.class, fetch = FetchType.LAZY)
     @JoinColumn(name = "sw_id", foreignKey = @ForeignKey(value = ConstraintMode.CONSTRAINT, name = "fk_metadata_sw"))
     private SoftwareModule softwareModule;
 
-    /**
-     * Default constructor for JPA.
-     */
     public SoftwareModuleMetadata() {
-        // default constructor for JPA.
+        // default public constructor for JPA
     }
 
-    /**
-     * Standard constructor.
-     *
-     * @param key
-     *            of the meta data element
-     * @param softwareModule
-     * @param value
-     *            of the meta data element
-     */
     public SoftwareModuleMetadata(final String key, final SoftwareModule softwareModule, final String value) {
-        this.key = key;
+        super(key, value);
         this.softwareModule = softwareModule;
-        this.value = value;
     }
 
     public SwMetadataCompositeKey getId() {
-        return new SwMetadataCompositeKey(softwareModule, key);
+        return new SwMetadataCompositeKey(softwareModule, getKey());
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    public void setValue(final String value) {
-        this.value = value;
     }
 
     public SoftwareModule getSoftwareModule() {
@@ -85,47 +54,20 @@ public class SoftwareModuleMetadata implements Serializable {
         this.softwareModule = softwareModule;
     }
 
-    public String getKey() {
-        return key;
-    }
-
-    public void setKey(final String key) {
-        this.key = key;
-    }
-
-    @Override
-    public String toString() {
-        return "SoftwareModuleMetadata [key=" + key + ", value=" + value + ", softwareModule=" + softwareModule + "]";
-    }
-
     @Override
     public int hashCode() {
         final int prime = 31;
-        int result = 1;
+        int result = super.hashCode();
-        result = prime * result + ((key == null) ? 0 : key.hashCode());
         result = prime * result + ((softwareModule == null) ? 0 : softwareModule.hashCode());
         return result;
     }
 
     @Override
     public boolean equals(final Object obj) {
-        if (this == obj) {
+        if (!super.equals(obj)) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (!(obj instanceof SoftwareModuleMetadata)) {
             return false;
         }
         final SoftwareModuleMetadata other = (SoftwareModuleMetadata) obj;
-        if (key == null) {
-            if (other.key != null) {
-                return false;
-            }
-        } else if (!key.equals(other.key)) {
-            return false;
-        }
         if (softwareModule == null) {
             if (other.softwareModule != null) {
                 return false;
@@ -135,5 +77,4 @@ public class SoftwareModuleMetadata implements Serializable {
         }
         return true;
     }
-
 }

hawkbit-rest-api/src/main/java/org/eclipse/hawkbit/rest/resource/model/PagedList.java

@@ -14,9 +14,11 @@ import javax.validation.constraints.NotNull;
 
 import org.springframework.hateoas.ResourceSupport;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
  * A list representation with meta data for pagination, e.g. containing the
@@ -31,8 +33,10 @@ import com.fasterxml.jackson.annotation.JsonInclude.Include;
 @JsonInclude(Include.NON_NULL)
 public class PagedList<T> extends ResourceSupport {
 
+    @JsonProperty
     private final List<T> content;
-    private final long totalElements;
+    @JsonProperty
+    private final long total;
     private final int size;
 
     /**
@@ -46,9 +50,10 @@ public class PagedList<T> extends ResourceSupport {
      * @throws NullPointerException
      *             in case {@code content} is {@code null}.
      */
-    public PagedList(@NotNull final List<T> content, final long total) {
+    @JsonCreator
+    public PagedList(@JsonProperty("content") @NotNull final List<T> content, @JsonProperty("total") final long total) {
         this.size = content.size();
-        this.totalElements = total;
+        this.total = total;
         this.content = content;
     }
 
@@ -63,7 +68,7 @@ public class PagedList<T> extends ResourceSupport {
      * @return the total amount of elements
      */
     public long getTotal() {
-        return totalElements;
+        return total;
     }
 
     public List<T> getContent() {

hawkbit-rest-resource/pom.xml

@@ -25,6 +25,11 @@
          <groupId>org.eclipse.hawkbit</groupId>
          <artifactId>hawkbit-repository</artifactId>
          <version>${project.version}</version>
+      </dependency>
+       <dependency>
+         <groupId>org.eclipse.hawkbit</groupId>
+         <artifactId>hawkbit-core</artifactId>
+         <version>${project.version}</version>
       </dependency>
       <dependency>
          <groupId>org.eclipse.hawkbit</groupId>

hawkbit-rest-resource/src/main/java/org/eclipse/hawkbit/controller/DataConversionHelper.java

@@ -18,6 +18,8 @@ import java.util.stream.Collectors;
 
 import javax.servlet.http.HttpServletResponse;
 
+import org.eclipse.hawkbit.api.ArtifactUrlHandler;
+import org.eclipse.hawkbit.api.UrlProtocol;
 import org.eclipse.hawkbit.controller.model.Artifact;
 import org.eclipse.hawkbit.controller.model.Chunk;
 import org.eclipse.hawkbit.controller.model.Config;
@@ -29,27 +31,29 @@ import org.eclipse.hawkbit.repository.model.LocalArtifact;
 import org.eclipse.hawkbit.repository.model.Target;
 import org.eclipse.hawkbit.rest.resource.model.artifact.ArtifactHash;
 import org.eclipse.hawkbit.tenancy.TenantAware;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.hateoas.Link;
 
 import com.google.common.base.Charsets;
 
 /**
  * Utility class for the Controller API.
- *
- *
- *
- *
  */
 public final class DataConversionHelper {
 
+    @Autowired
+    ArtifactUrlHandler artifactUrlHandler;
+
     // utility class, private constructor.
     private DataConversionHelper() {
 
     }
 
-    static List<Chunk> createChunks(final String targetid, final Action uAction, final TenantAware tenantAware) {
+    static List<Chunk> createChunks(final String targetid, final Action uAction,
-        return uAction.getDistributionSet()
+            final ArtifactUrlHandler artifactUrlHandler) {
-                .getModules().stream().map(module -> new Chunk(mapChunkLegacyKeys(module.getType().getKey()),
+        return uAction.getDistributionSet().getModules().stream()
-                        module.getVersion(), module.getName(), createArtifacts(targetid, module, tenantAware)))
+                .map(module -> new Chunk(mapChunkLegacyKeys(module.getType().getKey()), module.getVersion(),
+                        module.getName(), createArtifacts(targetid, module, artifactUrlHandler)))
                 .collect(Collectors.toList());
 
     }
@@ -72,23 +76,25 @@ public final class DataConversionHelper {
      *            of the target
      * @param module
      *            the software module
-     * @param tenantAware
-     *            of the tenant
      * @return a list of artifacts or a empty list. Cannot be <null>.
      */
     public static List<Artifact> createArtifacts(final String targetid,
-            final org.eclipse.hawkbit.repository.model.SoftwareModule module, final TenantAware tenantAware) {
+            final org.eclipse.hawkbit.repository.model.SoftwareModule module,
+            final ArtifactUrlHandler artifactUrlHandler) {
         final List<Artifact> files = new ArrayList<>();
         module.getLocalArtifacts().forEach(artifact -> {
             final Artifact file = new Artifact();
             file.setHashes(new ArtifactHash(artifact.getSha1Hash(), artifact.getMd5Hash()));
             file.setFilename(artifact.getFilename());
             file.setSize(artifact.getSize());
-
+            final String linkHttp = artifactUrlHandler.getUrl(targetid, artifact.getSoftwareModule().getId(),
-            file.add(linkTo(methodOn(RootController.class, tenantAware.getCurrentTenant()).downloadArtifact(targetid,
+                    artifact.getFilename(), artifact.getSha1Hash(), UrlProtocol.HTTP);
-                    artifact.getSoftwareModule().getId(), artifact.getFilename(), null, null)).withRel("download"));
+            final String linkHttps = artifactUrlHandler.getUrl(targetid, artifact.getSoftwareModule().getId(),
-            file.add(linkTo(methodOn(RootController.class, tenantAware.getCurrentTenant()).downloadArtifactMd5(targetid,
+                    artifact.getFilename(), artifact.getSha1Hash(), UrlProtocol.HTTPS);
-                    artifact.getSoftwareModule().getId(), artifact.getFilename(), null, null)).withRel("md5sum"));
+            file.add(new Link(linkHttps).withRel("download"));
+            file.add(new Link(linkHttps + ControllerConstants.ARTIFACT_MD5_DWNL_SUFFIX).withRel("md5sum"));
+            file.add(new Link(linkHttp).withRel("download-http"));
+            file.add(new Link(linkHttp + ControllerConstants.ARTIFACT_MD5_DWNL_SUFFIX).withRel("md5sum-http"));
 
             files.add(file);
         });

hawkbit-rest-resource/src/main/java/org/eclipse/hawkbit/controller/RootController.java

@@ -15,6 +15,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 
+import org.eclipse.hawkbit.api.ArtifactUrlHandler;
 import org.eclipse.hawkbit.artifact.repository.model.DbArtifact;
 import org.eclipse.hawkbit.cache.CacheWriteNotify;
 import org.eclipse.hawkbit.controller.model.ActionFeedback;
@@ -84,11 +85,14 @@ public class RootController {
     @Autowired
     private CacheWriteNotify cacheWriteNotify;
 
+    @Autowired
+    private HawkbitSecurityProperties securityProperties;
+
     @Autowired
     private TenantAware tenantAware;
 
     @Autowired
-    private HawkbitSecurityProperties securityProperties;
+    private ArtifactUrlHandler artifactUrlHandler;
 
     /**
      * Returns all artifacts of a given software module and target.
@@ -114,7 +118,7 @@ public class RootController {
 
         }
 
-        return new ResponseEntity<>(DataConversionHelper.createArtifacts(targetid, softwareModule, tenantAware),
+        return new ResponseEntity<>(DataConversionHelper.createArtifacts(targetid, softwareModule, artifactUrlHandler),
                 HttpStatus.OK);
     }
 
@@ -303,7 +307,7 @@ public class RootController {
 
         if (!action.isCancelingOrCanceled()) {
 
-            final List<Chunk> chunks = DataConversionHelper.createChunks(targetid, action, tenantAware);
+            final List<Chunk> chunks = DataConversionHelper.createChunks(targetid, action, artifactUrlHandler);
 
             final HandlingType handlingType = action.isForce() ? HandlingType.FORCED : HandlingType.ATTEMPT;
 

hawkbit-rest-resource/src/test/java/org/eclipse/hawkbit/controller/DeploymentBaseTest.java

@@ -170,15 +170,27 @@ public class DeploymentBaseTest extends AbstractIntegrationTestWithMongoDB {
                         jsonPath("$deployment.chunks[?(@.part==os)][0].artifacts[0].hashes.sha1",
                                 equalTo(artifact.getSha1Hash())))
                 .andExpect(jsonPath("$deployment.chunks[?(@.part==os)][0].artifacts[0]._links.download.href",
-                        equalTo("http://localhost/" + tenantAware.getCurrentTenant()
+                        equalTo("https://localhost/" + tenantAware.getCurrentTenant()
                                 + "/controller/v1/4712/softwaremodules/"
                                 + findDistributionSetByAction.findFirstModuleByType(osType).getId()
                                 + "/artifacts/test1")))
                 .andExpect(jsonPath("$deployment.chunks[?(@.part==os)][0].artifacts[0]._links.md5sum.href",
+                        equalTo("https://localhost/" + tenantAware.getCurrentTenant()
+                                + "/controller/v1/4712/softwaremodules/"
+                                + findDistributionSetByAction.findFirstModuleByType(osType).getId()
+                                + "/artifacts/test1.MD5SUM")))
+
+                .andExpect(jsonPath("$deployment.chunks[?(@.part==os)][0].artifacts[0]._links.download-http.href",
+                        equalTo("http://localhost/" + tenantAware.getCurrentTenant()
+                                + "/controller/v1/4712/softwaremodules/"
+                                + findDistributionSetByAction.findFirstModuleByType(osType).getId()
+                                + "/artifacts/test1")))
+                .andExpect(jsonPath("$deployment.chunks[?(@.part==os)][0].artifacts[0]._links.md5sum-http.href",
                         equalTo("http://localhost/" + tenantAware.getCurrentTenant()
                                 + "/controller/v1/4712/softwaremodules/"
                                 + findDistributionSetByAction.findFirstModuleByType(osType).getId()
                                 + "/artifacts/test1.MD5SUM")))
+
                 .andExpect(jsonPath("$deployment.chunks[?(@.part==os)][0].artifacts[1].size", equalTo(5 * 1024)))
                 .andExpect(jsonPath("$deployment.chunks[?(@.part==os)][0].artifacts[1].filename",
                         equalTo("test1.signature")))
@@ -188,11 +200,21 @@ public class DeploymentBaseTest extends AbstractIntegrationTestWithMongoDB {
                         jsonPath("$deployment.chunks[?(@.part==os)][0].artifacts[1].hashes.sha1",
                                 equalTo(artifactSignature.getSha1Hash())))
                 .andExpect(jsonPath("$deployment.chunks[?(@.part==os)][0].artifacts[1]._links.download.href",
-                        equalTo("http://localhost/" + tenantAware.getCurrentTenant()
+                        equalTo("https://localhost/" + tenantAware.getCurrentTenant()
                                 + "/controller/v1/4712/softwaremodules/"
                                 + findDistributionSetByAction.findFirstModuleByType(osType).getId()
                                 + "/artifacts/test1.signature")))
                 .andExpect(jsonPath("$deployment.chunks[?(@.part==os)][0].artifacts[1]._links.md5sum.href",
+                        equalTo("https://localhost/" + tenantAware.getCurrentTenant()
+                                + "/controller/v1/4712/softwaremodules/"
+                                + findDistributionSetByAction.findFirstModuleByType(osType).getId()
+                                + "/artifacts/test1.signature.MD5SUM")))
+                .andExpect(jsonPath("$deployment.chunks[?(@.part==os)][0].artifacts[1]._links.download-http.href",
+                        equalTo("http://localhost/" + tenantAware.getCurrentTenant()
+                                + "/controller/v1/4712/softwaremodules/"
+                                + findDistributionSetByAction.findFirstModuleByType(osType).getId()
+                                + "/artifacts/test1.signature")))
+                .andExpect(jsonPath("$deployment.chunks[?(@.part==os)][0].artifacts[1]._links.md5sum-http.href",
                         equalTo("http://localhost/" + tenantAware.getCurrentTenant()
                                 + "/controller/v1/4712/softwaremodules/"
                                 + findDistributionSetByAction.findFirstModuleByType(osType).getId()
@@ -293,12 +315,12 @@ public class DeploymentBaseTest extends AbstractIntegrationTestWithMongoDB {
                         jsonPath("$deployment.chunks[?(@.part==os)][0].artifacts[0].hashes.sha1",
                                 equalTo(artifact.getSha1Hash())))
                 .andExpect(jsonPath("$deployment.chunks[?(@.part==os)][0].artifacts[0]._links.download.href",
-                        equalTo("http://localhost/" + tenantAware.getCurrentTenant()
+                        equalTo("https://localhost/" + tenantAware.getCurrentTenant()
                                 + "/controller/v1/4712/softwaremodules/"
                                 + findDistributionSetByAction.findFirstModuleByType(osType).getId()
                                 + "/artifacts/test1")))
                 .andExpect(jsonPath("$deployment.chunks[?(@.part==os)][0].artifacts[0]._links.md5sum.href",
-                        equalTo("http://localhost/" + tenantAware.getCurrentTenant()
+                        equalTo("https://localhost/" + tenantAware.getCurrentTenant()
                                 + "/controller/v1/4712/softwaremodules/"
                                 + findDistributionSetByAction.findFirstModuleByType(osType).getId()
                                 + "/artifacts/test1.MD5SUM")))
@@ -311,11 +333,21 @@ public class DeploymentBaseTest extends AbstractIntegrationTestWithMongoDB {
                         jsonPath("$deployment.chunks[?(@.part==os)][0].artifacts[1].hashes.sha1",
                                 equalTo(artifactSignature.getSha1Hash())))
                 .andExpect(jsonPath("$deployment.chunks[?(@.part==os)][0].artifacts[1]._links.download.href",
-                        equalTo("http://localhost/" + tenantAware.getCurrentTenant()
+                        equalTo("https://localhost/" + tenantAware.getCurrentTenant()
                                 + "/controller/v1/4712/softwaremodules/"
                                 + findDistributionSetByAction.findFirstModuleByType(osType).getId()
                                 + "/artifacts/test1.signature")))
                 .andExpect(jsonPath("$deployment.chunks[?(@.part==os)][0].artifacts[1]._links.md5sum.href",
+                        equalTo("https://localhost/" + tenantAware.getCurrentTenant()
+                                + "/controller/v1/4712/softwaremodules/"
+                                + findDistributionSetByAction.findFirstModuleByType(osType).getId()
+                                + "/artifacts/test1.signature.MD5SUM")))
+                .andExpect(jsonPath("$deployment.chunks[?(@.part==os)][0].artifacts[1]._links.download-http.href",
+                        equalTo("http://localhost/" + tenantAware.getCurrentTenant()
+                                + "/controller/v1/4712/softwaremodules/"
+                                + findDistributionSetByAction.findFirstModuleByType(osType).getId()
+                                + "/artifacts/test1.signature")))
+                .andExpect(jsonPath("$deployment.chunks[?(@.part==os)][0].artifacts[1]._links.md5sum-http.href",
                         equalTo("http://localhost/" + tenantAware.getCurrentTenant()
                                 + "/controller/v1/4712/softwaremodules/"
                                 + findDistributionSetByAction.findFirstModuleByType(osType).getId()
@@ -409,15 +441,25 @@ public class DeploymentBaseTest extends AbstractIntegrationTestWithMongoDB {
                 .andExpect(jsonPath("$deployment.chunks[?(@.part==os)][0].artifacts[0].filename", equalTo("test1")))
                 .andExpect(jsonPath("$deployment.chunks[?(@.part==os)][0].artifacts[0].hashes.md5",
                         equalTo(artifact.getMd5Hash())))
-                .andExpect(
+                .andExpect(jsonPath("$deployment.chunks[?(@.part==os)][0].artifacts[0].hashes.sha1",
-                        jsonPath("$deployment.chunks[?(@.part==os)][0].artifacts[0].hashes.sha1",
+                        equalTo(artifact.getSha1Hash())))
-                                equalTo(artifact.getSha1Hash())))
+
                 .andExpect(jsonPath("$deployment.chunks[?(@.part==os)][0].artifacts[0]._links.download.href",
-                        equalTo("http://localhost/" + tenantAware.getCurrentTenant()
+                        equalTo("https://localhost/" + tenantAware.getCurrentTenant()
                                 + "/controller/v1/4712/softwaremodules/"
                                 + findDistributionSetByAction.findFirstModuleByType(osType).getId()
                                 + "/artifacts/test1")))
                 .andExpect(jsonPath("$deployment.chunks[?(@.part==os)][0].artifacts[0]._links.md5sum.href",
+                        equalTo("https://localhost/" + tenantAware.getCurrentTenant()
+                                + "/controller/v1/4712/softwaremodules/"
+                                + findDistributionSetByAction.findFirstModuleByType(osType).getId()
+                                + "/artifacts/test1.MD5SUM")))
+                .andExpect(jsonPath("$deployment.chunks[?(@.part==os)][0].artifacts[0]._links.download-http.href",
+                        equalTo("http://localhost/" + tenantAware.getCurrentTenant()
+                                + "/controller/v1/4712/softwaremodules/"
+                                + findDistributionSetByAction.findFirstModuleByType(osType).getId()
+                                + "/artifacts/test1")))
+                .andExpect(jsonPath("$deployment.chunks[?(@.part==os)][0].artifacts[0]._links.md5sum-http.href",
                         equalTo("http://localhost/" + tenantAware.getCurrentTenant()
                                 + "/controller/v1/4712/softwaremodules/"
                                 + findDistributionSetByAction.findFirstModuleByType(osType).getId()
@@ -431,15 +473,27 @@ public class DeploymentBaseTest extends AbstractIntegrationTestWithMongoDB {
                         jsonPath("$deployment.chunks[?(@.part==os)][0].artifacts[1].hashes.sha1",
                                 equalTo(artifactSignature.getSha1Hash())))
                 .andExpect(jsonPath("$deployment.chunks[?(@.part==os)][0].artifacts[1]._links.download.href",
-                        equalTo("http://localhost/" + tenantAware.getCurrentTenant()
+                        equalTo("https://localhost/" + tenantAware.getCurrentTenant()
                                 + "/controller/v1/4712/softwaremodules/"
                                 + findDistributionSetByAction.findFirstModuleByType(osType).getId()
                                 + "/artifacts/test1.signature")))
                 .andExpect(jsonPath("$deployment.chunks[?(@.part==os)][0].artifacts[1]._links.md5sum.href",
+                        equalTo("https://localhost/" + tenantAware.getCurrentTenant()
+                                + "/controller/v1/4712/softwaremodules/"
+                                + findDistributionSetByAction.findFirstModuleByType(osType).getId()
+                                + "/artifacts/test1.signature.MD5SUM")))
+
+                .andExpect(jsonPath("$deployment.chunks[?(@.part==os)][0].artifacts[1]._links.download-http.href",
+                        equalTo("http://localhost/" + tenantAware.getCurrentTenant()
+                                + "/controller/v1/4712/softwaremodules/"
+                                + findDistributionSetByAction.findFirstModuleByType(osType).getId()
+                                + "/artifacts/test1.signature")))
+                .andExpect(jsonPath("$deployment.chunks[?(@.part==os)][0].artifacts[1]._links.md5sum-http.href",
                         equalTo("http://localhost/" + tenantAware.getCurrentTenant()
                                 + "/controller/v1/4712/softwaremodules/"
                                 + findDistributionSetByAction.findFirstModuleByType(osType).getId()
                                 + "/artifacts/test1.signature.MD5SUM")))
+
                 .andExpect(jsonPath("$deployment.chunks[?(@.part==bApp)][0].version",
                         equalTo(ds.findFirstModuleByType(appType).getVersion())))
                 .andExpect(jsonPath("$deployment.chunks[?(@.part==bApp)][0].name",

hawkbit-security-core/src/main/java/org/eclipse/hawkbit/im/authentication/SpPermission.java

@@ -182,6 +182,12 @@ public final class SpPermission {
          */
         public static final String CONTROLLER_ROLE_ANONYMOUS = "ROLE_CONTROLLER_ANONYMOUS";
 
+        /**
+         * The role which contains in the spring security context in case an
+         * controller is authenticated to download artifacts.
+         */
+        public static final String CONTROLLER_DOWNLOAD_ROLE = "ROLE_CONTROLLER_DOWNLOAD";
+
         /**
          * The role which contains the spring security context in case the
          * system is executing code which is necessary to be privileged.
@@ -275,8 +281,16 @@ public final class SpPermission {
          * context contains the anoynmous role or the controller specific role
          * {@link SpPermission#CONTROLLER_ROLE}.
          */
-        public static final String IS_CONTROLLER = "hasAnyRole('" + CONTROLLER_ROLE_ANONYMOUS + "', '"
+        public static final String IS_CONTROLLER = "hasAnyRole('" + CONTROLLER_ROLE_ANONYMOUS + "', '" + CONTROLLER_ROLE
-                + CONTROLLER_ROLE + "')";
+                + "')";
+
+        /**
+         * Spring security eval hasAuthority expression to check if the spring
+         * context contains the role to allow controllers to download specific
+         * role {@link SpPermission#CONTROLLER_DOWNLOAD_ROLE}.
+         */
+        public static final String HAS_CONTROLLER_DOWNLOAD = HAS_AUTH_PREFIX + CONTROLLER_DOWNLOAD_ROLE
+                + HAS_AUTH_SUFFIX;
 
         /**
          * Spring security eval hasAnyRole expression to check if the spring

hawkbit-security-integration/pom.xml

@@ -35,7 +35,32 @@
          <groupId>org.springframework.security</groupId>
          <artifactId>spring-security-web</artifactId>
       </dependency>
+
+      <!-- TEST -->
+      <dependency>
+         <groupId>junit</groupId>
+         <artifactId>junit</artifactId>
+         <scope>test</scope>
+      </dependency>
+       <dependency>
+         <groupId>org.easytesting</groupId>
+         <artifactId>fest-assert-core</artifactId>
+         <scope>test</scope>
+      </dependency>
+      <dependency>
+         <groupId>org.easytesting</groupId>
+         <artifactId>fest-assert</artifactId>
+         <scope>test</scope>
+      </dependency>
+      <dependency>
+         <groupId>org.mockito</groupId>
+         <artifactId>mockito-core</artifactId>
+         <scope>test</scope>
+      </dependency>
+      <dependency>
+         <groupId>ru.yandex.qatools.allure</groupId>
+         <artifactId>allure-junit-adaptor</artifactId>
+         <scope>test</scope>
+      </dependency>
    </dependencies>
-
-
 </project>

hawkbit-security-integration/src/main/java/org/eclipse/hawkbit/security/AbstractControllerAuthenticationFilter.java

@@ -8,7 +8,7 @@
  */
 package org.eclipse.hawkbit.security;
 
-import org.eclipse.hawkbit.dmf.json.model.TenantSecruityToken;
+import org.eclipse.hawkbit.dmf.json.model.TenantSecurityToken;
 import org.eclipse.hawkbit.repository.TenantConfigurationManagement;
 import org.eclipse.hawkbit.tenancy.TenantAware;
 import org.eclipse.hawkbit.tenancy.configuration.TenantConfigurationKey;
@@ -42,15 +42,15 @@ public abstract class AbstractControllerAuthenticationFilter implements PreAuthe
     protected abstract TenantConfigurationKey getTenantConfigurationKey();
 
     @Override
-    public boolean isEnable(final TenantSecruityToken secruityToken) {
+    public boolean isEnable(final TenantSecurityToken secruityToken) {
         return tenantAware.runAsTenant(secruityToken.getTenant(), configurationKeyTenantRunner);
     }
 
     @Override
-    public abstract HeaderAuthentication getPreAuthenticatedPrincipal(TenantSecruityToken secruityToken);
+    public abstract HeaderAuthentication getPreAuthenticatedPrincipal(TenantSecurityToken secruityToken);
 
     @Override
-    public abstract HeaderAuthentication getPreAuthenticatedCredentials(TenantSecruityToken secruityToken);
+    public abstract HeaderAuthentication getPreAuthenticatedCredentials(TenantSecurityToken secruityToken);
 
     private final class SecurityConfigurationKeyTenantRunner implements TenantAware.TenantRunner<Boolean> {
         @Override

hawkbit-security-integration/src/main/java/org/eclipse/hawkbit/security/CoapAnonymousPreAuthenticatedFilter.java

@@ -8,7 +8,7 @@
  */
 package org.eclipse.hawkbit.security;
 
-import org.eclipse.hawkbit.dmf.json.model.TenantSecruityToken;
+import org.eclipse.hawkbit.dmf.json.model.TenantSecurityToken;
 
 /**
  * A Filter for device which download via coap.
@@ -19,19 +19,19 @@ import org.eclipse.hawkbit.dmf.json.model.TenantSecruityToken;
 public class CoapAnonymousPreAuthenticatedFilter implements PreAuthenficationFilter {
 
     @Override
-    public HeaderAuthentication getPreAuthenticatedPrincipal(final TenantSecruityToken secruityToken) {
+    public HeaderAuthentication getPreAuthenticatedPrincipal(final TenantSecurityToken secruityToken) {
-        return new HeaderAuthentication(secruityToken.getControllerId(), TenantSecruityToken.COAP_TOKEN_VALUE);
+        return new HeaderAuthentication(secruityToken.getControllerId(), TenantSecurityToken.COAP_TOKEN_VALUE);
     }
 
     @Override
-    public HeaderAuthentication getPreAuthenticatedCredentials(final TenantSecruityToken secruityToken) {
+    public HeaderAuthentication getPreAuthenticatedCredentials(final TenantSecurityToken secruityToken) {
-        return new HeaderAuthentication(secruityToken.getControllerId(), TenantSecruityToken.COAP_TOKEN_VALUE);
+        return new HeaderAuthentication(secruityToken.getControllerId(), TenantSecurityToken.COAP_TOKEN_VALUE);
     }
 
     @Override
-    public boolean isEnable(final TenantSecruityToken secruityToken) {
+    public boolean isEnable(final TenantSecurityToken secruityToken) {
-        final String authHeader = secruityToken.getHeader(TenantSecruityToken.COAP_AUTHORIZATION_HEADER);
+        final String authHeader = secruityToken.getHeader(TenantSecurityToken.COAP_AUTHORIZATION_HEADER);
-        return TenantSecruityToken.COAP_TOKEN_VALUE.equals(authHeader);
+        return TenantSecurityToken.COAP_TOKEN_VALUE.equals(authHeader);
     }
 
 }

hawkbit-security-integration/src/main/java/org/eclipse/hawkbit/security/ControllerPreAuthenticateSecurityTokenFilter.java

@@ -8,7 +8,7 @@
  */
 package org.eclipse.hawkbit.security;
 
-import org.eclipse.hawkbit.dmf.json.model.TenantSecruityToken;
+import org.eclipse.hawkbit.dmf.json.model.TenantSecurityToken;
 import org.eclipse.hawkbit.im.authentication.SpPermission;
 import org.eclipse.hawkbit.im.authentication.TenantAwareAuthenticationDetails;
 import org.eclipse.hawkbit.repository.ControllerManagement;
@@ -67,8 +67,8 @@ public class ControllerPreAuthenticateSecurityTokenFilter extends AbstractContro
     }
 
     @Override
-    public HeaderAuthentication getPreAuthenticatedPrincipal(final TenantSecruityToken secruityToken) {
+    public HeaderAuthentication getPreAuthenticatedPrincipal(final TenantSecurityToken secruityToken) {
-        final String authHeader = secruityToken.getHeader(TenantSecruityToken.AUTHORIZATION_HEADER);
+        final String authHeader = secruityToken.getHeader(TenantSecurityToken.AUTHORIZATION_HEADER);
         if ((authHeader != null) && authHeader.startsWith(TARGET_SECURITY_TOKEN_AUTH_SCHEME)) {
             LOGGER.debug("found authorization header with scheme {} using target security token for authentication",
                     TARGET_SECURITY_TOKEN_AUTH_SCHEME);
@@ -81,7 +81,7 @@ public class ControllerPreAuthenticateSecurityTokenFilter extends AbstractContro
     }
 
     @Override
-    public HeaderAuthentication getPreAuthenticatedCredentials(final TenantSecruityToken secruityToken) {
+    public HeaderAuthentication getPreAuthenticatedCredentials(final TenantSecurityToken secruityToken) {
         final String securityToken = tenantAware.runAsTenant(secruityToken.getTenant(),
                 new GetSecurityTokenTenantRunner(secruityToken.getTenant(), secruityToken.getControllerId()));
         return new HeaderAuthentication(secruityToken.getControllerId(), securityToken);

hawkbit-security-integration/src/main/java/org/eclipse/hawkbit/security/ControllerPreAuthenticatedAnonymousDownload.java

@@ -0,0 +1,69 @@
+/**
+ * Copyright (c) 2015 Bosch Software Innovations GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
+package org.eclipse.hawkbit.security;
+
+import java.util.Collection;
+
+import org.eclipse.hawkbit.dmf.json.model.TenantSecurityToken;
+import org.eclipse.hawkbit.im.authentication.SpPermission.SpringEvalExpressions;
+import org.eclipse.hawkbit.repository.TenantConfigurationManagement;
+import org.eclipse.hawkbit.tenancy.TenantAware;
+import org.eclipse.hawkbit.tenancy.configuration.TenantConfigurationKey;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+
+import com.google.common.collect.Lists;
+
+/**
+ * An pre-authenticated processing filter which add the
+ * {@link SpringEvalExpressions#CONTROLLER_DOWNLOAD_ROLE_ANONYMOUS} to the
+ * security context in case the anonymous download is allowed through
+ * configuration.
+ */
+public class ControllerPreAuthenticatedAnonymousDownload extends AbstractControllerAuthenticationFilter {
+
+    /**
+     * Constructor.
+     * 
+     * @param tenantConfigurationManagement
+     *            the tenant management service to retrieve configuration
+     *            properties
+     * @param tenantAware
+     *            the tenant aware service to get configuration for the specific
+     *            tenant
+     * @param systemSecurityContext
+     *            the system security context to get access to tenant
+     *            configuration
+     */
+    public ControllerPreAuthenticatedAnonymousDownload(
+            final TenantConfigurationManagement tenantConfigurationManagement, final TenantAware tenantAware,
+            final SystemSecurityContext systemSecurityContext) {
+        super(tenantConfigurationManagement, tenantAware, systemSecurityContext);
+    }
+
+    @Override
+    public HeaderAuthentication getPreAuthenticatedPrincipal(final TenantSecurityToken secruityToken) {
+        return new HeaderAuthentication(secruityToken.getControllerId(), secruityToken.getControllerId());
+    }
+
+    @Override
+    public HeaderAuthentication getPreAuthenticatedCredentials(final TenantSecurityToken secruityToken) {
+        return new HeaderAuthentication(secruityToken.getControllerId(), secruityToken.getControllerId());
+    }
+
+    @Override
+    protected TenantConfigurationKey getTenantConfigurationKey() {
+        return TenantConfigurationKey.ANONYMOUS_DOWNLOAD_MODE_ENABLED;
+    }
+
+    @Override
+    public Collection<GrantedAuthority> getSuccessfulAuthenticationAuthorities() {
+        return Lists.newArrayList(new SimpleGrantedAuthority(SpringEvalExpressions.CONTROLLER_DOWNLOAD_ROLE));
+    }
+}

hawkbit-security-integration/src/main/java/org/eclipse/hawkbit/security/ControllerPreAuthenticatedAnonymousFilter.java

@@ -0,0 +1,47 @@
+/**
+ * Copyright (c) 2015 Bosch Software Innovations GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
+package org.eclipse.hawkbit.security;
+
+import org.eclipse.hawkbit.dmf.json.model.TenantSecurityToken;
+
+/**
+ * An anonymous controller filter which is only enabled in case of anonymous
+ * access is granted. This should only be for development purposes.
+ * 
+ * @see DdiSecurityProperties
+ */
+public class ControllerPreAuthenticatedAnonymousFilter implements PreAuthenficationFilter {
+
+    private final DdiSecurityProperties ddiSecurityConfiguration;
+
+    /**
+     * @param ddiSecurityConfiguration
+     *            the security configuration which holds the configuration if
+     *            anonymous is enabled or not
+     */
+    public ControllerPreAuthenticatedAnonymousFilter(final DdiSecurityProperties ddiSecurityConfiguration) {
+        this.ddiSecurityConfiguration = ddiSecurityConfiguration;
+    }
+
+    @Override
+    public HeaderAuthentication getPreAuthenticatedPrincipal(final TenantSecurityToken secruityToken) {
+        return new HeaderAuthentication(secruityToken.getControllerId(), secruityToken.getControllerId());
+    }
+
+    @Override
+    public HeaderAuthentication getPreAuthenticatedCredentials(final TenantSecurityToken secruityToken) {
+        return new HeaderAuthentication(secruityToken.getControllerId(), secruityToken.getControllerId());
+    }
+
+    @Override
+    public boolean isEnable(final TenantSecurityToken secruityToken) {
+        return ddiSecurityConfiguration.getAuthentication().getAnonymous().isEnabled();
+    }
+
+}

hawkbit-security-integration/src/main/java/org/eclipse/hawkbit/security/ControllerPreAuthenticatedGatewaySecurityTokenFilter.java

@@ -8,7 +8,7 @@
  */
 package org.eclipse.hawkbit.security;
 
-import org.eclipse.hawkbit.dmf.json.model.TenantSecruityToken;
+import org.eclipse.hawkbit.dmf.json.model.TenantSecurityToken;
 import org.eclipse.hawkbit.repository.TenantConfigurationManagement;
 import org.eclipse.hawkbit.tenancy.TenantAware;
 import org.eclipse.hawkbit.tenancy.configuration.TenantConfigurationKey;
@@ -56,8 +56,8 @@ public class ControllerPreAuthenticatedGatewaySecurityTokenFilter extends Abstra
     }
 
     @Override
-    public HeaderAuthentication getPreAuthenticatedPrincipal(final TenantSecruityToken secruityToken) {
+    public HeaderAuthentication getPreAuthenticatedPrincipal(final TenantSecurityToken secruityToken) {
-        final String authHeader = secruityToken.getHeader(TenantSecruityToken.AUTHORIZATION_HEADER);
+        final String authHeader = secruityToken.getHeader(TenantSecurityToken.AUTHORIZATION_HEADER);
         if ((authHeader != null) && authHeader.startsWith(GATEWAY_SECURITY_TOKEN_AUTH_SCHEME)) {
             LOGGER.debug("found authorization header with scheme {} using target security token for authentication",
                     GATEWAY_SECURITY_TOKEN_AUTH_SCHEME);
@@ -71,7 +71,7 @@ public class ControllerPreAuthenticatedGatewaySecurityTokenFilter extends Abstra
     }
 
     @Override
-    public HeaderAuthentication getPreAuthenticatedCredentials(final TenantSecruityToken secruityToken) {
+    public HeaderAuthentication getPreAuthenticatedCredentials(final TenantSecurityToken secruityToken) {
         final String gatewayToken = tenantAware.runAsTenant(secruityToken.getTenant(),
                 gatewaySecurityTokenKeyConfigRunner);
         return new HeaderAuthentication(secruityToken.getControllerId(), gatewayToken);

hawkbit-security-integration/src/main/java/org/eclipse/hawkbit/security/ControllerPreAuthenticatedSecurityHeaderFilter.java

@@ -8,7 +8,7 @@
  */
 package org.eclipse.hawkbit.security;
 
-import org.eclipse.hawkbit.dmf.json.model.TenantSecruityToken;
+import org.eclipse.hawkbit.dmf.json.model.TenantSecurityToken;
 import org.eclipse.hawkbit.repository.TenantConfigurationManagement;
 import org.eclipse.hawkbit.tenancy.TenantAware;
 import org.eclipse.hawkbit.tenancy.configuration.TenantConfigurationKey;
@@ -18,7 +18,7 @@ import org.slf4j.LoggerFactory;
 /**
  * An pre-authenticated processing filter which extracts the principal from a
  * request URI and the credential from a request header in a the
- * {@link TenantSecruityToken}.
+ * {@link TenantSecurityToken}.
  *
  *
  *
@@ -75,7 +75,7 @@ public class ControllerPreAuthenticatedSecurityHeaderFilter extends AbstractCont
     }
 
     @Override
-    public HeaderAuthentication getPreAuthenticatedPrincipal(final TenantSecruityToken secruityToken) {
+    public HeaderAuthentication getPreAuthenticatedPrincipal(final TenantSecurityToken secruityToken) {
         // retrieve the common name header and the authority name header from
         // the http request and
         // combine them together
@@ -97,7 +97,7 @@ public class ControllerPreAuthenticatedSecurityHeaderFilter extends AbstractCont
     }
 
     @Override
-    public HeaderAuthentication getPreAuthenticatedCredentials(final TenantSecruityToken secruityToken) {
+    public HeaderAuthentication getPreAuthenticatedCredentials(final TenantSecurityToken secruityToken) {
         final String authorityNameConfigurationValue = tenantAware.runAsTenant(secruityToken.getTenant(),
                 sslIssuerNameConfigTenantRunner);
         String controllerId = secruityToken.getControllerId();
@@ -117,7 +117,7 @@ public class ControllerPreAuthenticatedSecurityHeaderFilter extends AbstractCont
      * It's ok if we find the the hash in any the trusted CA chain to accept
      * this request for this tenant.
      */
-    private String getIssuerHashHeader(final TenantSecruityToken secruityToken, final String knownIssuerHash) {
+    private String getIssuerHashHeader(final TenantSecurityToken secruityToken, final String knownIssuerHash) {
         // iterate over the headers until we get a null header.
         int iHeader = 1;
         String foundHash;

hawkbit-security-integration/src/main/java/org/eclipse/hawkbit/security/PreAuthTokenSourceTrustAuthenticationProvider.java

@@ -109,6 +109,7 @@ public class PreAuthTokenSourceTrustAuthenticationProvider implements Authentica
         if (successAuthentication) {
             final Collection<GrantedAuthority> controllerAuthorities = new ArrayList<>();
             controllerAuthorities.add(new SimpleGrantedAuthority(SpringEvalExpressions.CONTROLLER_ROLE));
+            controllerAuthorities.add(new SimpleGrantedAuthority(SpringEvalExpressions.CONTROLLER_DOWNLOAD_ROLE));
             final PreAuthenticatedAuthenticationToken successToken = new PreAuthenticatedAuthenticationToken(principal,
                     credentials, controllerAuthorities);
             successToken.setDetails(tokenDetails);

hawkbit-security-integration/src/main/java/org/eclipse/hawkbit/security/PreAuthenficationFilter.java

@@ -8,7 +8,12 @@
  */
 package org.eclipse.hawkbit.security;
 
-import org.eclipse.hawkbit.dmf.json.model.TenantSecruityToken;
+import java.util.Collection;
+import java.util.Collections;
+
+import org.eclipse.hawkbit.dmf.json.model.TenantSecurityToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.GrantedAuthority;
 
 /**
  * Interface for Pre Authenfication.
@@ -25,7 +30,7 @@ public interface PreAuthenficationFilter {
      *            the secruity info
      * @return <true> is enabled <false> diabled
      */
-    boolean isEnable(TenantSecruityToken secruityToken);
+    boolean isEnable(TenantSecurityToken secruityToken);
 
     /**
      * Extract the principal information from the current secruityToken.
@@ -34,7 +39,7 @@ public interface PreAuthenficationFilter {
      *            the secruityToken
      * @return the extracted tenant and controller id
      */
-    HeaderAuthentication getPreAuthenticatedPrincipal(TenantSecruityToken secruityToken);
+    HeaderAuthentication getPreAuthenticatedPrincipal(TenantSecurityToken secruityToken);
 
     /**
      * Extract the principal credentials from the current secruityToken.
@@ -43,6 +48,18 @@ public interface PreAuthenficationFilter {
      *            the secruityToken
      * @return the extracted tenant and controller id
      */
-    HeaderAuthentication getPreAuthenticatedCredentials(TenantSecruityToken secruityToken);
+    HeaderAuthentication getPreAuthenticatedCredentials(TenantSecurityToken secruityToken);
+
+    /**
+     * Allows to add additional authorities to the successful authenticated
+     * token.
+     * 
+     * @return the authorities granted to the principal, or an empty collection
+     *         if the token has not been authenticated. Never null.
+     * @see Authentication#getAuthorities()
+     */
+    default Collection<GrantedAuthority> getSuccessfulAuthenticationAuthorities() {
+        return Collections.emptyList();
+    };
 
 }

hawkbit-security-integration/src/test/java/org/eclipse/hawkbit/security/ControllerPreAuthenticatedAnonymousDownloadTest.java

@@ -0,0 +1,61 @@
+/**
+ * Copyright (c) 2015 Bosch Software Innovations GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
+package org.eclipse.hawkbit.security;
+
+import static org.fest.assertions.Assertions.assertThat;
+
+import org.eclipse.hawkbit.im.authentication.SpPermission.SpringEvalExpressions;
+import org.eclipse.hawkbit.repository.TenantConfigurationManagement;
+import org.eclipse.hawkbit.tenancy.TenantAware;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+
+import ru.yandex.qatools.allure.annotations.Features;
+import ru.yandex.qatools.allure.annotations.Stories;
+
+/**
+ * @author Michael Hirsch
+ *
+ */
+@Features("Unit Tests - Security")
+@Stories("Exclude path aware shallow ETag filter")
+@RunWith(MockitoJUnitRunner.class)
+public class ControllerPreAuthenticatedAnonymousDownloadTest {
+
+    private ControllerPreAuthenticatedAnonymousDownload underTest;
+
+    @Mock
+    private TenantConfigurationManagement tenantConfigurationManagementMock;
+
+    @Mock
+    private TenantAware tenantAwareMock;
+
+    @Before
+    public void before() {
+        underTest = new ControllerPreAuthenticatedAnonymousDownload(tenantConfigurationManagementMock, tenantAwareMock,
+                new SystemSecurityContext(tenantAwareMock));
+    }
+
+    @Test
+    public void useCorrectTenantConfiguationKey() {
+        assertThat(underTest.getTenantConfigurationKey()).as("Should be using the correct tenant configuration key")
+                .isEqualTo(underTest.getTenantConfigurationKey());
+    }
+
+    @Test
+    public void successfulAuthenticationAdditionalAuthoritiesForDownload() {
+        assertThat(underTest.getSuccessfulAuthenticationAuthorities())
+                .as("Additional authorities should be containing the download anonymous role")
+                .contains(new SimpleGrantedAuthority(SpringEvalExpressions.CONTROLLER_DOWNLOAD_ROLE));
+    }
+}

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadLayout.java

@@ -215,13 +215,15 @@ public class UploadLayout extends VerticalLayout {
                 hasDirectory = Boolean.TRUE;
             }
         }
-    }
 
-    private static boolean isDirectory(final Html5File file) {
+        private StreamVariable createStreamVariable(final Html5File file) {
-        if (Strings.isNullOrEmpty(file.getType()) && file.getFileSize() % 4096 == 0) {
+            return new UploadHandler(file.getFileName(), file.getFileSize(), UploadLayout.this, uploadInfoWindow,
-            return true;
+                    spInfo.getMaxArtifactFileSize(), null, file.getType());
+        }
+
+        private boolean isDirectory(final Html5File file) {
+            return Strings.isNullOrEmpty(file.getType()) && file.getFileSize() % 4096 == 0;
         }
-        return false;
     }
 
     private void displayCompositeMessage() {
@@ -282,11 +284,6 @@ public class UploadLayout extends VerticalLayout {
         discardBtn.addClickListener(event -> discardUploadData(event));
     }
 
-    private StreamVariable createStreamVariable(final Html5File file) {
-        return new UploadHandler(file.getFileName(), file.getFileSize(), this, uploadInfoWindow,
-                spInfo.getMaxArtifactFileSize(), null, file.getType());
-    }
-
     boolean checkForDuplicate(final String filename) {
         final Boolean isDuplicate = checkIfFileIsDuplicate(filename);
         if (isDuplicate) {
@@ -349,17 +346,17 @@ public class UploadLayout extends VerticalLayout {
         }
     }
 
-    Boolean validate(DragAndDropEvent event) {
+    Boolean validate(final DragAndDropEvent event) {
         // check if drop is valid.If valid ,check if software module is
         // selected.
-        if(!isFilesDropped(event)){
+        if (!isFilesDropped(event)) {
             uiNotification.displayValidationError(i18n.get("message.action.not.allowed"));
             return false;
         }
         return checkIfSoftwareModuleIsSelected();
     }
 
-    private boolean isFilesDropped(DragAndDropEvent event) {
+    private boolean isFilesDropped(final DragAndDropEvent event) {
         if (event.getTransferable() instanceof WrapperTransferable) {
             final Html5File[] files = ((WrapperTransferable) event.getTransferable()).getFiles();
             // other components can also be wrapped in WrapperTransferable , so
@@ -448,7 +445,7 @@ public class UploadLayout extends VerticalLayout {
     }
 
     private String getDuplicateFileValidationMessage() {
-        StringBuilder message = new StringBuilder();
+        final StringBuilder message = new StringBuilder();
         if (!duplicateFileNamesList.isEmpty()) {
             final String fileNames = StringUtils.collectionToCommaDelimitedString(duplicateFileNamesList);
             if (duplicateFileNamesList.size() == 1) {
@@ -655,8 +652,7 @@ public class UploadLayout extends VerticalLayout {
         return uiNotification;
     }
 
-    
+    public void setHasDirectory(final Boolean hasDirectory) {
-    public void setHasDirectory(Boolean hasDirectory) {
         this.hasDirectory = hasDirectory;
     }
 }

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/tagdetails/AbstractTagToken.java

@@ -196,18 +196,25 @@ public abstract class AbstractTagToken<T extends BaseEntity> implements Serializ
             }
         }
 
-    }
+        private void updateTokenStyle(final Object tokenId, final Button button) {
+            final String color = getColor(tokenId);
+            button.setCaption("<span style=\"color:" + color + " !important;\">" + FontAwesome.CIRCLE.getHtml()
+                    + "</span>" + " " + getItemNameProperty(tokenId).getValue().toString().concat(" ×"));
+            button.setCaptionAsHtml(true);
+        }
 
-    private void updateTokenStyle(final Object tokenId, final Button button) {
+        private void onTokenSearch(final Object tokenId) {
-        final String color = getColor(tokenId);
+            assignTag(getItemNameProperty(tokenId).getValue().toString());
-        button.setCaption("<span style=\"color:" + color + " !important;\">" + FontAwesome.CIRCLE.getHtml() + "</span>"
+            removeTagAssignedFromCombo((Long) tokenId);
-                + " " + getItemNameProperty(tokenId).getValue().toString().concat(" ×"));
+        }
-        button.setCaptionAsHtml(true);
+
-    }
+        private void tokenClick(final Object tokenId) {
+            final Item item = tokenField.getContainerDataSource().addItem(tokenId);
+            item.getItemProperty("name").setValue(tagDetails.get(tokenId).getName());
+            item.getItemProperty(COLOR_PROPERTY).setValue(tagDetails.get(tokenId).getColor());
+            unassignTag(tagDetails.get(tokenId).getName());
+        }
 
-    private void onTokenSearch(final Object tokenId) {
-        assignTag(getItemNameProperty(tokenId).getValue().toString());
-        removeTagAssignedFromCombo((Long) tokenId);
     }
 
     private Property getItemNameProperty(final Object tokenId) {
@@ -229,13 +236,6 @@ public abstract class AbstractTagToken<T extends BaseEntity> implements Serializ
         return (String) item.getItemProperty("name").getValue();
     }
 
-    private void tokenClick(final Object tokenId) {
-        final Item item = tokenField.getContainerDataSource().addItem(tokenId);
-        item.getItemProperty("name").setValue(tagDetails.get(tokenId).getName());
-        item.getItemProperty(COLOR_PROPERTY).setValue(tagDetails.get(tokenId).getColor());
-        unassignTag(tagDetails.get(tokenId).getName());
-    }
-
     protected void removePreviouslyAddedTokens() {
         tokensAdded.keySet().forEach(previouslyAddedToken -> tokenField.removeToken(previouslyAddedToken));
     }

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/BulkUploadHandler.java

@@ -63,14 +63,10 @@ import com.vaadin.ui.Upload.SucceededListener;
 
 /**
  * Bulk target upload handler.
- *
  */
 public class BulkUploadHandler extends CustomComponent
         implements SucceededListener, FailedListener, Receiver, StartedListener {
 
-    /**
-     *
-     */
     private static final long serialVersionUID = -1273494705754674501L;
     private static final Logger LOG = LoggerFactory.getLogger(BulkUploadHandler.class);
 
@@ -149,12 +145,6 @@ public class BulkUploadHandler extends CustomComponent
         setCompositionRoot(horizontalLayout);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see com.vaadin.ui.Upload.Receiver#receiveUpload(java.lang.String,
-     * java.lang.String)
-     */
     @Override
     public OutputStream receiveUpload(final String filename, final String mimeType) {
         try {
@@ -170,25 +160,11 @@ public class BulkUploadHandler extends CustomComponent
         return new NullOutputStream();
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * com.vaadin.ui.Upload.FailedListener#uploadFailed(com.vaadin.ui.Upload.
-     * FailedEvent)
-     */
     @Override
     public void uploadFailed(final FailedEvent event) {
         LOG.info("Upload failed for file :{} due to {}", event.getFilename(), event.getReason());
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * com.vaadin.ui.Upload.SucceededListener#uploadSucceeded(com.vaadin.ui.
-     * Upload.SucceededEvent)
-     */
     @Override
     public void uploadSucceeded(final SucceededEvent event) {
         executor.execute(new UploadAsync(event));
@@ -252,6 +228,61 @@ public class BulkUploadHandler extends CustomComponent
             }
         }
 
+        private double getTotalNumberOfLines() {
+
+            double totalFileSize = 0;
+            try (InputStreamReader inputStreamReader = new InputStreamReader(new FileInputStream(tempFile),
+                    Charset.defaultCharset())) {
+                try (BufferedReader readerForSize = new BufferedReader(inputStreamReader)) {
+                    totalFileSize = readerForSize.lines().count();
+                }
+            } catch (final FileNotFoundException e) {
+                LOG.error("Error reading file {}", tempFile.getName(), e);
+            } catch (final IOException e) {
+                LOG.error("Error while closing reader of file {}", tempFile.getName(), e);
+            }
+
+            return totalFileSize;
+        }
+
+        private void resetCounts() {
+            successfullTargetCount = 0;
+            failedTargetCount = 0;
+        }
+
+        private void deleteFile() {
+            if (tempFile.exists()) {
+                final boolean isDeleted = tempFile.delete();
+                if (!isDeleted) {
+                    LOG.info("File {} was not deleted !", tempFile.getName());
+                }
+            }
+            tempFile = null;
+        }
+
+        private void readEachLine(final String line, final double innerCounter, final double totalFileSize) {
+            final String csvDelimiter = ",";
+            final String[] targets = line.split(csvDelimiter);
+            if (targets.length == 2) {
+                final String controllerId = targets[0];
+                final String targetName = targets[1];
+                addNewTarget(controllerId, targetName);
+            } else {
+                failedTargetCount++;
+            }
+            final float current = managementUIState.getTargetTableFilters().getBulkUpload()
+                    .getProgressBarCurrentValue();
+            final float next = (float) (innerCounter / totalFileSize);
+            if (Math.abs(next - 0.1) < 0.00001 || current - next >= 0 || next - current >= 0.05
+                    || Math.abs(next - 1) < 0.00001) {
+                managementUIState.getTargetTableFilters().getBulkUpload().setProgressBarCurrentValue(next);
+                managementUIState.getTargetTableFilters().getBulkUpload()
+                        .setSucessfulUploadCount(successfullTargetCount);
+                managementUIState.getTargetTableFilters().getBulkUpload().setFailedUploadCount(failedTargetCount);
+                eventBus.publish(this, new TargetTableEvent(TargetComponentEvent.BULK_TARGET_CREATED));
+            }
+        }
+
         private void doAssignments() {
             final StringBuilder errorMessage = new StringBuilder();
             String dsAssignmentFailedMsg = null;
@@ -267,6 +298,41 @@ public class BulkUploadHandler extends CustomComponent
             displayValidationMessage(errorMessage, dsAssignmentFailedMsg, tagAssignmentFailedMsg);
         }
 
+        private String saveAllAssignments() {
+            final ActionType actionType = ActionType.FORCED;
+            final long forcedTimeStamp = new Date().getTime();
+            final TargetBulkUpload targetBulkUpload = managementUIState.getTargetTableFilters().getBulkUpload();
+            final List<String> targetsList = targetBulkUpload.getTargetsCreated();
+            final DistributionSetIdName dsSelected = (DistributionSetIdName) comboBox.getValue();
+            if (distributionSetManagement.findDistributionSetById(dsSelected.getId()) == null) {
+                return i18n.get("message.bulk.upload.assignment.failed");
+            }
+            deploymentManagement.assignDistributionSet(targetBulkUpload.getDsNameAndVersion().getId(), actionType,
+                    forcedTimeStamp, targetsList.toArray(new String[targetsList.size()]));
+            return null;
+        }
+
+        private String tagAssignment() {
+            final Map<Long, TagData> tokensSelected = targetBulkTokenTags.getTokensAdded();
+            final List<String> deletedTags = new ArrayList<>();
+            for (final TagData tagData : tokensSelected.values()) {
+                if (tagManagement.findTargetTagById(tagData.getId()) == null) {
+                    deletedTags.add(tagData.getName());
+                } else {
+                    targetManagement.toggleTagAssignment(
+                            managementUIState.getTargetTableFilters().getBulkUpload().getTargetsCreated(),
+                            tagData.getName());
+                }
+            }
+            if (deletedTags.isEmpty()) {
+                return null;
+            }
+            if (deletedTags.size() == 1) {
+                return i18n.get("message.bulk.upload.tag.assignment.failed", deletedTags.get(0));
+            }
+            return i18n.get("message.bulk.upload.tag.assignments.failed");
+        }
+
         private boolean ifTagsSelected() {
             return targetBulkTokenTags.getTokenField().getValue() != null;
         }
@@ -307,59 +373,6 @@ public class BulkUploadHandler extends CustomComponent
         }
     }
 
-    private double getTotalNumberOfLines() {
-
-        double totalFileSize = 0;
-        try (InputStreamReader inputStreamReader = new InputStreamReader(new FileInputStream(tempFile),
-                Charset.defaultCharset())) {
-            try (BufferedReader readerForSize = new BufferedReader(inputStreamReader)) {
-                totalFileSize = readerForSize.lines().count();
-            }
-        } catch (final FileNotFoundException e) {
-            LOG.error("Error reading file {}", tempFile.getName(), e);
-        } catch (final IOException e) {
-            LOG.error("Error while closing reader of file {}", tempFile.getName(), e);
-        }
-
-        return totalFileSize;
-    }
-
-    private void resetCounts() {
-        successfullTargetCount = 0;
-        failedTargetCount = 0;
-    }
-
-    private void deleteFile() {
-        if (tempFile.exists()) {
-            final boolean isDeleted = tempFile.delete();
-            if (!isDeleted) {
-                LOG.info("File {} was not deleted !", tempFile.getName());
-            }
-        }
-        tempFile = null;
-    }
-
-    private void readEachLine(final String line, final double innerCounter, final double totalFileSize) {
-        final String csvDelimiter = ",";
-        final String[] targets = line.split(csvDelimiter);
-        if (targets.length == 2) {
-            final String controllerId = targets[0];
-            final String targetName = targets[1];
-            addNewTarget(controllerId, targetName);
-        } else {
-            failedTargetCount++;
-        }
-        final float current = managementUIState.getTargetTableFilters().getBulkUpload().getProgressBarCurrentValue();
-        final float next = (float) (innerCounter / totalFileSize);
-        if (Math.abs(next - 0.1) < 0.00001 || current - next >= 0 || next - current >= 0.05
-                || Math.abs(next - 1) < 0.00001) {
-            managementUIState.getTargetTableFilters().getBulkUpload().setProgressBarCurrentValue(next);
-            managementUIState.getTargetTableFilters().getBulkUpload().setSucessfulUploadCount(successfullTargetCount);
-            managementUIState.getTargetTableFilters().getBulkUpload().setFailedUploadCount(failedTargetCount);
-            eventBus.publish(this, new TargetTableEvent(TargetComponentEvent.BULK_TARGET_CREATED));
-        }
-    }
-
     private void addNewTarget(final String controllerId, final String name) {
         final String newControllerId = HawkbitCommonUtil.trimAndNullIfEmpty(controllerId);
         if (mandatoryCheck(newControllerId) && duplicateCheck(newControllerId)) {
@@ -405,43 +418,6 @@ public class BulkUploadHandler extends CustomComponent
         }
     }
 
-    private String saveAllAssignments() {
-        final ActionType actionType = ActionType.FORCED;
-        final long forcedTimeStamp = new Date().getTime();
-        final TargetBulkUpload targetBulkUpload = managementUIState.getTargetTableFilters().getBulkUpload();
-        final List<String> targetsList = targetBulkUpload.getTargetsCreated();
-        final DistributionSetIdName dsSelected = (DistributionSetIdName) comboBox.getValue();
-        if (distributionSetManagement.findDistributionSetById(dsSelected.getId()) == null) {
-            return i18n.get("message.bulk.upload.assignment.failed");
-        } else {
-            deploymentManagement.assignDistributionSet(targetBulkUpload.getDsNameAndVersion().getId(), actionType,
-                    forcedTimeStamp, targetsList.toArray(new String[targetsList.size()]));
-            return null;
-        }
-    }
-
-    private String tagAssignment() {
-        final Map<Long, TagData> tokensSelected = targetBulkTokenTags.getTokensAdded();
-        final List<String> deletedTags = new ArrayList<>();
-        for (final TagData tagData : tokensSelected.values()) {
-            if (tagManagement.findTargetTagById(tagData.getId()) == null) {
-                deletedTags.add(tagData.getName());
-            } else {
-                targetManagement.toggleTagAssignment(
-                        managementUIState.getTargetTableFilters().getBulkUpload().getTargetsCreated(),
-                        tagData.getName());
-            }
-        }
-        if (!deletedTags.isEmpty()) {
-            if (deletedTags.size() == 1) {
-                return i18n.get("message.bulk.upload.tag.assignment.failed", deletedTags.get(0));
-            } else {
-                return i18n.get("message.bulk.upload.tag.assignments.failed");
-            }
-        }
-        return null;
-    }
-
     private static class NullOutputStream extends OutputStream {
         /**
          * null output stream.
@@ -462,13 +438,6 @@ public class BulkUploadHandler extends CustomComponent
         return upload;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * com.vaadin.ui.Upload.StartedListener#uploadStarted(com.vaadin.ui.Upload
-     * .StartedEvent)
-     */
     @Override
     public void uploadStarted(final StartedEvent event) {
         if (!event.getFilename().endsWith(".csv")) {

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rollout/RolloutListGrid.java

@@ -356,7 +356,6 @@ public class RolloutListGrid extends AbstractGrid {
         return context;
     }
 
-
     private void getUpdateMenuItem(final ContextMenu context, final Long rolloutId) {
         // Add 'Update' option only if user has update permission
         if (!permissionChecker.hasRolloutUpdatePermission()) {
@@ -366,17 +365,6 @@ public class RolloutListGrid extends AbstractGrid {
         cancelItem.setData(new ContextMenuData(rolloutId, ACTION.UPDATE));
     }
 
-    private String convertRolloutStatusToString(final RolloutStatus value) {
-        final StatusFontIcon statusFontIcon = statusIconMap.get(value);
-        if (statusFontIcon == null) {
-            return null;
-        }
-        final String codePoint = statusFontIcon.getFontIcon() != null
-                ? Integer.toString(statusFontIcon.getFontIcon().getCodepoint()) : null;
-        return HawkbitCommonUtil.getStatusLabelDetailsInString(codePoint, statusFontIcon.getStyle(),
-                SPUIComponetIdProvider.ROLLOUT_STATUS_LABEL_ID);
-    }
-
     private void menuItemClicked(final ContextMenuItemClickEvent event) {
         final ContextMenuItem item = (ContextMenuItem) event.getSource();
         final ContextMenuData contextMenuData = (ContextMenuData) item.getData();
@@ -537,6 +525,13 @@ public class RolloutListGrid extends AbstractGrid {
         public Class<String> getPresentationType() {
             return String.class;
         }
+
+        private String convertRolloutStatusToString(final RolloutStatus value) {
+            final StatusFontIcon statusFontIcon = statusIconMap.get(value);
+            final String codePoint = HawkbitCommonUtil.getCodePoint(statusFontIcon);
+            return HawkbitCommonUtil.getStatusLabelDetailsInString(codePoint, statusFontIcon.getStyle(),
+                    SPUIComponetIdProvider.ROLLOUT_STATUS_LABEL_ID);
+        }
     }
 
     /**
@@ -549,14 +544,16 @@ public class RolloutListGrid extends AbstractGrid {
         private static final long serialVersionUID = -5794528427855153924L;
 
         @Override
-        public TotalTargetCountStatus convertToModel(final String value, final Class<? extends TotalTargetCountStatus> targetType,
+        public TotalTargetCountStatus convertToModel(final String value,
-                final Locale locale) throws com.vaadin.data.util.converter.Converter.ConversionException {
+                final Class<? extends TotalTargetCountStatus> targetType, final Locale locale)
+                throws com.vaadin.data.util.converter.Converter.ConversionException {
             return null;
         }
 
         @Override
-        public String convertToPresentation(final TotalTargetCountStatus value, final Class<? extends String> targetType,
+        public String convertToPresentation(final TotalTargetCountStatus value,
-                final Locale locale) throws com.vaadin.data.util.converter.Converter.ConversionException {
+                final Class<? extends String> targetType, final Locale locale)
+                throws com.vaadin.data.util.converter.Converter.ConversionException {
             return DistributionBarHelper.getDistributionBarAsHTMLString(value.getStatusTotalCountMap());
         }
 

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgroup/RolloutGroupListGrid.java

@@ -217,7 +217,7 @@ public class RolloutGroupListGrid extends AbstractGrid {
         createRolloutGroupStatusToFontMap();
         getColumn(SPUILabelDefinitions.VAR_STATUS).setRenderer(new HtmlLabelRenderer(),
                 new RolloutGroupStatusConverter());
-        
+
         getColumn(SPUILabelDefinitions.VAR_TOTAL_TARGETS_COUNT_STATUS).setRenderer(new HtmlRenderer(),
                 new TotalTargetCountStatusConverter());
         if (permissionChecker.hasRolloutTargetsReadPermission()) {
@@ -250,18 +250,6 @@ public class RolloutGroupListGrid extends AbstractGrid {
         eventBus.publish(this, RolloutEvent.SHOW_ROLLOUT_GROUP_TARGETS);
     }
 
-    private String convertRolloutGroupStatusToString(final RolloutGroupStatus value) {
-        final StatusFontIcon statusFontIcon = statusIconMap.get(value);
-        if (statusFontIcon == null) {
-            return null;
-        }
-        final String codePoint = statusFontIcon.getFontIcon() != null
-                ? Integer.toString(statusFontIcon.getFontIcon().getCodepoint()) : null;
-        return HawkbitCommonUtil.getStatusLabelDetailsInString(codePoint, statusFontIcon.getStyle(),
-                SPUIComponetIdProvider.ROLLOUT_GROUP_STATUS_LABEL_ID);
-
-    }
-
     private void createRolloutGroupStatusToFontMap() {
         statusIconMap.put(RolloutGroupStatus.FINISHED,
                 new StatusFontIcon(FontAwesome.CHECK_CIRCLE, SPUIStyleDefinitions.STATUS_ICON_GREEN));
@@ -316,14 +304,16 @@ public class RolloutGroupListGrid extends AbstractGrid {
         private static final long serialVersionUID = -9205943894818450807L;
 
         @Override
-        public TotalTargetCountStatus convertToModel(final String value, final Class<? extends TotalTargetCountStatus> targetType,
+        public TotalTargetCountStatus convertToModel(final String value,
-                final Locale locale) throws com.vaadin.data.util.converter.Converter.ConversionException {
+                final Class<? extends TotalTargetCountStatus> targetType, final Locale locale)
+                throws com.vaadin.data.util.converter.Converter.ConversionException {
             return null;
         }
 
         @Override
-        public String convertToPresentation(final TotalTargetCountStatus value, final Class<? extends String> targetType,
+        public String convertToPresentation(final TotalTargetCountStatus value,
-                final Locale locale) throws com.vaadin.data.util.converter.Converter.ConversionException {
+                final Class<? extends String> targetType, final Locale locale)
+                throws com.vaadin.data.util.converter.Converter.ConversionException {
             return DistributionBarHelper.getDistributionBarAsHTMLString(value.getStatusTotalCountMap());
         }
 
@@ -369,5 +359,13 @@ public class RolloutGroupListGrid extends AbstractGrid {
             return String.class;
         }
 
+        private String convertRolloutGroupStatusToString(final RolloutGroupStatus value) {
+            final StatusFontIcon statusFontIcon = statusIconMap.get(value);
+            final String codePoint = HawkbitCommonUtil.getCodePoint(statusFontIcon);
+            return HawkbitCommonUtil.getStatusLabelDetailsInString(codePoint, statusFontIcon.getStyle(),
+                    SPUIComponetIdProvider.ROLLOUT_GROUP_STATUS_LABEL_ID);
+
+        }
+
     }
 }

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/rollout/rolloutgrouptargets/RolloutGroupTargetsListGrid.java

@@ -196,11 +196,9 @@ public class RolloutGroupTargetsListGrid extends AbstractGrid {
         public String convertToPresentation(final Status status, final Class<? extends String> targetType,
                 final Locale locale) {
             if (status == null) {
-                // Actions are not created for targets when
+                // Actions are not created for targets when rollout's status is
-                // rollout's status
+                // READY and when duplicate assignment is done. In these cases
-                // is READY and when duplicate assignment is done.
+                // display a appropriate status with description
-                // In these cases display a appropriate status with
-                // description
                 return getStatus();
             }
             return processActionStatus(status);
@@ -216,16 +214,27 @@ public class RolloutGroupTargetsListGrid extends AbstractGrid {
             return String.class;
         }
 
-    }
+        private String processActionStatus(final Status status) {
-
+            final StatusFontIcon statusFontIcon = statusIconMap.get(status);
-    private String processActionStatus(final Status status) {
+            final String codePoint = HawkbitCommonUtil.getCodePoint(statusFontIcon);
-        final StatusFontIcon statusFontIcon = statusIconMap.get(status);
+            return HawkbitCommonUtil.getStatusLabelDetailsInString(codePoint, statusFontIcon.getStyle(), null);
-        if (statusFontIcon == null) {
-            return null;
         }
-        final String codePoint = statusFontIcon.getFontIcon() != null
+
-                ? Integer.toString(statusFontIcon.getFontIcon().getCodepoint()) : null;
+        private String getStatus() {
-        return HawkbitCommonUtil.getStatusLabelDetailsInString(codePoint, statusFontIcon.getStyle(), null);
+            final RolloutGroup rolloutGroup = rolloutUIState.getRolloutGroup().isPresent()
+                    ? rolloutUIState.getRolloutGroup().get() : null;
+            if (rolloutGroup != null && rolloutGroup.getStatus() == RolloutGroupStatus.READY) {
+                return HawkbitCommonUtil.getStatusLabelDetailsInString(
+                        Integer.toString(FontAwesome.DOT_CIRCLE_O.getCodepoint()), "statusIconLightBlue", null);
+            }
+            if (rolloutGroup != null && rolloutGroup.getStatus() == RolloutGroupStatus.FINISHED) {
+                return HawkbitCommonUtil.getStatusLabelDetailsInString(
+                        Integer.toString(FontAwesome.MINUS_CIRCLE.getCodepoint()), "statusIconBlue", null);
+            }
+            return HawkbitCommonUtil.getStatusLabelDetailsInString(
+                    Integer.toString(FontAwesome.QUESTION_CIRCLE.getCodepoint()), "statusIconBlue", null);
+        }
+
     }
 
     private void createRolloutStatusToFontMap() {
@@ -249,21 +258,6 @@ public class RolloutGroupTargetsListGrid extends AbstractGrid {
                 new StatusFontIcon(FontAwesome.EXCLAMATION_CIRCLE, SPUIStyleDefinitions.STATUS_ICON_RED));
     }
 
-    private String getStatus() {
-        final RolloutGroup rolloutGroup = rolloutUIState.getRolloutGroup().isPresent()
-                ? rolloutUIState.getRolloutGroup().get() : null;
-        if (rolloutGroup != null && rolloutGroup.getStatus() == RolloutGroupStatus.READY) {
-            return HawkbitCommonUtil.getStatusLabelDetailsInString(
-                    Integer.toString(FontAwesome.DOT_CIRCLE_O.getCodepoint()), "statusIconLightBlue", null);
-        } else if (rolloutGroup != null && rolloutGroup.getStatus() == RolloutGroupStatus.FINISHED) {
-            return HawkbitCommonUtil.getStatusLabelDetailsInString(
-                    Integer.toString(FontAwesome.MINUS_CIRCLE.getCodepoint()), "statusIconBlue", null);
-        } else {
-            return HawkbitCommonUtil.getStatusLabelDetailsInString(
-                    Integer.toString(FontAwesome.QUESTION_CIRCLE.getCodepoint()), "statusIconBlue", null);
-        }
-    }
-
     private String getDescription(final CellReference cell) {
         if (!SPUILabelDefinitions.VAR_STATUS.equals(cell.getPropertyId())) {
             return null;
@@ -274,7 +268,6 @@ public class RolloutGroupTargetsListGrid extends AbstractGrid {
         }
         return cell.getProperty().getValue().toString().toLowerCase();
     }
-       
 
     private String getDescriptionWhenNoAction() {
         final RolloutGroup rolloutGroup = rolloutUIState.getRolloutGroup().isPresent()

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/AuthenticationConfigurationView.java

@@ -30,9 +30,6 @@ import com.vaadin.ui.VerticalLayout;
 
 /**
  * View to configure the authentication mode.
- *
- *
- *
  */
 @SpringComponent
 @ViewScope

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/BaseConfigurationView.java

@@ -14,8 +14,8 @@ import java.util.List;
 import com.vaadin.ui.CustomComponent;
 
 /**
- * base class for all configuration views. This class implements the logic for
+ * Base class for all configuration views. This class implements the logic for
- * the handling of the
+ * the handling of the configurations in a consistent way.
  * 
  */
 public abstract class BaseConfigurationView extends CustomComponent implements ConfigurationGroup {

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/ConfigurationGroup.java

@@ -11,9 +11,8 @@ package org.eclipse.hawkbit.ui.tenantconfiguration;
 import com.vaadin.ui.Component;
 
 /**
- *
+ * Interface that all system configurations have to implement to save and undo
- *
+ * their customized changes.
- *
  */
 public interface ConfigurationGroup extends Component, ConfigurationItem {
 

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/ConfigurationItem.java

@@ -11,7 +11,7 @@ package org.eclipse.hawkbit.ui.tenantconfiguration;
 import java.io.Serializable;
 
 /**
- * represents an configurationItem, which can be modified by the user
+ * Represents an configurationItem, which can be modified by the user
  */
 public interface ConfigurationItem {
 

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/DefaultDistributionSetTypeLayout.java

@@ -33,9 +33,6 @@ import com.vaadin.ui.VerticalLayout;
 
 /**
  * Default DistributionSet Panel.
- *
- *
- *
  */
 @SpringComponent
 @ViewScope

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/DownloadAnonymousConfigurationView.java

@@ -0,0 +1,119 @@
+/**
+ * Copyright (c) 2015 Bosch Software Innovations GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
+package org.eclipse.hawkbit.ui.tenantconfiguration;
+
+import javax.annotation.PostConstruct;
+
+import org.eclipse.hawkbit.repository.TenantConfigurationManagement;
+import org.eclipse.hawkbit.repository.model.TenantConfigurationValue;
+import org.eclipse.hawkbit.tenancy.configuration.TenantConfigurationKey;
+import org.eclipse.hawkbit.ui.components.SPUIComponentProvider;
+import org.eclipse.hawkbit.ui.utils.I18N;
+import org.eclipse.hawkbit.ui.utils.SPUIComponetIdProvider;
+import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import com.vaadin.spring.annotation.SpringComponent;
+import com.vaadin.spring.annotation.ViewScope;
+import com.vaadin.ui.Alignment;
+import com.vaadin.ui.CheckBox;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.VerticalLayout;
+
+/**
+ * View to enable anonymous download.
+ */
+@SpringComponent
+@ViewScope
+public class DownloadAnonymousConfigurationView extends BaseConfigurationView
+        implements ConfigurationItem.ConfigurationItemChangeListener {
+
+    private static final String DIST_CHECKBOX_STYLE = "dist-checkbox-style";
+
+    private static final long serialVersionUID = 1L;
+
+    @Autowired
+    private I18N i18n;
+
+    @Autowired
+    private transient TenantConfigurationManagement tenantConfigurationManagement;
+
+    boolean anonymousDownloadEnabled;
+
+    private CheckBox downloadAnonymousCheckBox;
+
+    /**
+     * Initialize Default Download Anonymous layout.
+     */
+    @PostConstruct
+    public void init() {
+
+        final TenantConfigurationValue<Boolean> value = tenantConfigurationManagement
+                .getConfigurationValue(TenantConfigurationKey.ANONYMOUS_DOWNLOAD_MODE_ENABLED, Boolean.class);
+        anonymousDownloadEnabled = value.getValue();
+
+        final Panel rootPanel = new Panel();
+        rootPanel.setSizeFull();
+        rootPanel.addStyleName("config-panel");
+
+        final VerticalLayout vLayout = new VerticalLayout();
+        vLayout.setMargin(true);
+        vLayout.setSizeFull();
+
+        final Label headerDisSetType = new Label(i18n.get("enonymous.download.title"));
+        headerDisSetType.addStyleName("config-panel-header");
+        vLayout.addComponent(headerDisSetType);
+
+        final GridLayout gridLayout = new GridLayout(2, 1);
+        gridLayout.setSpacing(true);
+        gridLayout.setImmediate(true);
+        gridLayout.setColumnExpandRatio(1, 1.0F);
+        gridLayout.setSizeFull();
+
+        downloadAnonymousCheckBox = SPUIComponentProvider.getCheckBox("", DIST_CHECKBOX_STYLE, null, false, "");
+        downloadAnonymousCheckBox.setValue(anonymousDownloadEnabled);
+        downloadAnonymousCheckBox.addValueChangeListener(event -> configurationHasChanged());
+        downloadAnonymousCheckBox.setId(SPUIComponetIdProvider.SYSTEM_CONFIGURATION_ANONYMOUS_DOWNLOAD_CHECKBOX);
+
+        gridLayout.addComponent(downloadAnonymousCheckBox);
+
+        final Label configurationLabel = SPUIComponentProvider.getLabel(i18n.get("enonymous.download.label"),
+                SPUILabelDefinitions.SP_LABEL_SIMPLE);
+        gridLayout.addComponent(configurationLabel);
+        gridLayout.setComponentAlignment(configurationLabel, Alignment.MIDDLE_LEFT);
+
+        vLayout.addComponent(gridLayout);
+
+        rootPanel.setContent(vLayout);
+        setCompositionRoot(rootPanel);
+    }
+
+    @Override
+    public void configurationHasChanged() {
+        anonymousDownloadEnabled = downloadAnonymousCheckBox.getValue();
+        notifyConfigurationChanged();
+    }
+
+    @Override
+    public void save() {
+        tenantConfigurationManagement.addOrUpdateConfiguration(TenantConfigurationKey.ANONYMOUS_DOWNLOAD_MODE_ENABLED,
+                downloadAnonymousCheckBox.getValue());
+    }
+
+    @Override
+    public void undo() {
+        final TenantConfigurationValue<Boolean> value = tenantConfigurationManagement
+                .getConfigurationValue(TenantConfigurationKey.ANONYMOUS_DOWNLOAD_MODE_ENABLED, Boolean.class);
+        anonymousDownloadEnabled = value.getValue();
+        downloadAnonymousCheckBox.setValue(anonymousDownloadEnabled);
+    }
+
+}

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/PollingConfigurationView.java

@@ -29,8 +29,6 @@ import com.vaadin.ui.VerticalLayout;
 
 /**
  * View to configure the polling interval and the overdue time.
- * 
- *
  */
 @SpringComponent
 @ViewScope

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/TenantConfigurationDashboardView.java

@@ -38,9 +38,6 @@ import com.vaadin.ui.VerticalLayout;
 
 /**
  * Main UI for the system configuration view.
- *
- *
- *
  */
 @SpringView(name = TenantConfigurationDashboardView.VIEW_NAME, ui = HawkbitUI.class)
 @ViewScope
@@ -58,6 +55,9 @@ public class TenantConfigurationDashboardView extends CustomComponent implements
     @Autowired
     private PollingConfigurationView pollingConfigurationView;
 
+    @Autowired
+    private DownloadAnonymousConfigurationView downloadAnonymousConfigurationView;
+
     @Autowired
     private I18N i18n;
 
@@ -73,13 +73,14 @@ public class TenantConfigurationDashboardView extends CustomComponent implements
     private final List<ConfigurationGroup> configurationViews = new ArrayList<>();
 
     /**
-     * init method adds all Configuration Views to the list of Views.
+     * Init method adds all Configuration Views to the list of Views.
      */
     @PostConstruct
     public void init() {
         configurationViews.add(defaultDistributionSetTypeLayout);
         configurationViews.add(authenticationConfigurationView);
         configurationViews.add(pollingConfigurationView);
+        configurationViews.add(downloadAnonymousConfigurationView);
     }
 
     @Override
@@ -154,13 +155,6 @@ public class TenantConfigurationDashboardView extends CustomComponent implements
         undoConfigurationBtn.setEnabled(false);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.eclipse.hawkbit.server.ui.tenantconfiguration.ConfigurationGroup.
-     * ConfigurationGroupChangeListener #configurationChanged()
-     */
     @Override
     public void configurationHasChanged() {
         saveConfigurationBtn.setEnabled(true);

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/TenantConfigurationDashboardViewMenuItem.java

@@ -21,9 +21,6 @@ import com.vaadin.server.Resource;
 
 /**
  * Menu item for system configuration view.
- * 
- *
- *
  */
 @Component
 @Order(700)

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/authentication/CertificateAuthenticationConfigurationItem.java

@@ -26,16 +26,13 @@ import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.themes.ValoTheme;
 
 /**
- *
+ * This class represents the UI item for the certificate authenticated by an
- *
+ * reverse proxy in the authentication configuration view.
  */
 @SpringComponent
 @ViewScope
 public class CertificateAuthenticationConfigurationItem extends AbstractAuthenticationTenantConfigurationItem {
 
-    /**
-    * 
-    */
     private static final long serialVersionUID = 1L;
 
     @Autowired
@@ -59,7 +56,7 @@ public class CertificateAuthenticationConfigurationItem extends AbstractAuthenti
     }
 
     /**
-     * init mehotd called by spring.
+     * Init mehotd called by spring.
      */
     @PostConstruct
     public void init() {
@@ -94,12 +91,6 @@ public class CertificateAuthenticationConfigurationItem extends AbstractAuthenti
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.server.ui.tenantconfiguration.
-     * TenantConfigurationItem# configEnable()
-     */
     @Override
     public void configEnable() {
         if (!configurationEnabled) {
@@ -110,12 +101,6 @@ public class CertificateAuthenticationConfigurationItem extends AbstractAuthenti
         setDetailVisible(true);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.hawkbit.server.ui.tenantconfiguration.
-     * TenantConfigurationItem# configDisable()
-     */
     @Override
     public void configDisable() {
         if (configurationEnabled) {
@@ -125,11 +110,6 @@ public class CertificateAuthenticationConfigurationItem extends AbstractAuthenti
         setDetailVisible(false);
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see hawkbit.server.ui.tenantconfiguration.TenantConfigurationItem#save()
-     */
     @Override
     public void save() {
         if (configurationEnabledChange) {
@@ -142,11 +122,6 @@ public class CertificateAuthenticationConfigurationItem extends AbstractAuthenti
         }
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see hawkbit.server.ui.tenantconfiguration.TenantConfigurationItem#undo()
-     */
     @Override
     public void undo() {
         configurationEnabledChange = false;

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/authentication/GatewaySecurityTokenAuthenticationConfigurationItem.java

@@ -30,16 +30,13 @@ import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.themes.ValoTheme;
 
 /**
- *
+ * This class represents the UI item for the gateway security token section in
- *
+ * the authentication configuration view.
  */
 @SpringComponent
 @ViewScope
 public class GatewaySecurityTokenAuthenticationConfigurationItem extends AbstractAuthenticationTenantConfigurationItem {
 
-    /**
-    *
-    */
     private static final long serialVersionUID = 1L;
 
     @Autowired
@@ -70,7 +67,7 @@ public class GatewaySecurityTokenAuthenticationConfigurationItem extends Abstrac
     }
 
     /**
-     * init mehotd called by spring.
+     * Init mehotd called by spring.
      */
     @PostConstruct
     public void init() {
@@ -135,12 +132,6 @@ public class GatewaySecurityTokenAuthenticationConfigurationItem extends Abstrac
         notifyConfigurationChanged();
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.eclipse.hawkbit.server.ui.tenantconfiguration.
-     * TenantConfigurationItem# configEnable()
-     */
     @Override
     public void configEnable() {
         if (!configurationEnabled) {

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/authentication/TargetSecurityTokenAuthenticationConfigurationItem.java

@@ -19,17 +19,13 @@ import com.vaadin.spring.annotation.SpringComponent;
 import com.vaadin.spring.annotation.ViewScope;
 
 /**
- *
+ * This class represents the UI item for the target security token section in
- *
+ * the authentication configuration view.
- *
  */
 @SpringComponent
 @ViewScope
 public class TargetSecurityTokenAuthenticationConfigurationItem extends AbstractAuthenticationTenantConfigurationItem {
 
-    /**
-    *
-    */
     private static final long serialVersionUID = 1L;
 
     @Autowired
@@ -49,7 +45,7 @@ public class TargetSecurityTokenAuthenticationConfigurationItem extends Abstract
     }
 
     /**
-     * init mehotd called by spring.
+     * Init mehotd called by spring.
      */
     @PostConstruct
     public void init() {
@@ -57,12 +53,6 @@ public class TargetSecurityTokenAuthenticationConfigurationItem extends Abstract
         configurationEnabled = isConfigEnabled();
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.eclipse.hawkbit.server.ui.tenantconfiguration.
-     * TenantConfigurationItem# configEnable()
-     */
     @Override
     public void configEnable() {
         if (!configurationEnabled) {
@@ -71,12 +61,6 @@ public class TargetSecurityTokenAuthenticationConfigurationItem extends Abstract
         configurationEnabled = true;
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.eclipse.hawkbit.server.ui.tenantconfiguration.
-     * TenantConfigurationItem# configDisable()
-     */
     @Override
     public void configDisable() {
         if (configurationEnabled) {

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/polling/DurationConfigField.java

@@ -14,8 +14,6 @@ import java.util.List;
 
 import org.eclipse.hawkbit.ui.tenantconfiguration.ConfigurationItem;
 
-import com.vaadin.data.Property.ValueChangeEvent;
-import com.vaadin.data.Property.ValueChangeListener;
 import com.vaadin.ui.Alignment;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.GridLayout;
@@ -50,8 +48,8 @@ public class DurationConfigField extends GridLayout implements ConfigurationItem
         this.addComponent(durationField, 1, 0);
         this.setComponentAlignment(durationField, Alignment.MIDDLE_LEFT);
 
-        checkBox.addValueChangeListener(event->checkBoxChange());
+        checkBox.addValueChangeListener(event -> checkBoxChange());
-        durationField.addValueChangeListener(event->notifyConfigurationChanged());
+        durationField.addValueChangeListener(event -> notifyConfigurationChanged());
     }
 
     private void checkBoxChange() {

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/HawkbitCommonUtil.java

@@ -31,6 +31,7 @@ import org.eclipse.hawkbit.repository.model.TargetInfo.PollStatus;
 import org.eclipse.hawkbit.repository.model.TargetUpdateStatus;
 import org.eclipse.hawkbit.repository.model.TotalTargetCountStatus;
 import org.eclipse.hawkbit.repository.model.TotalTargetCountStatus.Status;
+import org.eclipse.hawkbit.ui.rollout.StatusFontIcon;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.security.core.userdetails.UserDetails;
@@ -89,8 +90,6 @@ public final class HawkbitCommonUtil {
     private static final String COUNT_STYLE = " countStyle = document.createElement('style'); ";
     private static final String COUNT_STYLE_ID = " countStyle.id=\"sp-drag-count\"; ";
     private static final String APPEND_CHILD = " document.head.appendChild(countStyle);";
-    private static final String HEADER_VERSION = "header.version";
-    private static final String HEADER_NAME = "header.name";
     private static final String SM_HIGHLIGHT_CREATE_SCRIPT = "smHighlight = document.createElement('style'); smHighlight.id=\"sm-table-highlight\";  document.head.appendChild(smHighlight); ";
     private static final String SM_HIGHLIGHT_REMOVE_SCRIPT = "var y = document.getElementById('sm-table-highlight'); if(y) { document.head.removeChild(y); } ";
     private static final String SM_HIGHLIGHT_RESET_SCRIPT = SM_HIGHLIGHT_REMOVE_SCRIPT + SM_HIGHLIGHT_CREATE_SCRIPT
@@ -1279,4 +1278,19 @@ public final class HawkbitCommonUtil {
         return val.toString();
     }
 
+    /**
+     * Receive the code point of a given StatusFontIcon.
+     * 
+     * @param statusFontIcon
+     *            the status font icon
+     * @return the code point of the StatusFontIcon
+     */
+    public static String getCodePoint(final StatusFontIcon statusFontIcon) {
+        if (statusFontIcon == null) {
+            return null;
+        }
+        return statusFontIcon.getFontIcon() != null ? Integer.toString(statusFontIcon.getFontIcon().getCodepoint())
+                : null;
+    }
+
 }

hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPUIComponetIdProvider.java

@@ -501,6 +501,11 @@ public final class SPUIComponetIdProvider {
      */
     public static final String SYSTEM_CONFIGURATION_CANCEL = "system.configuration.cancel";
 
+    /**
+     * Id of the anonymous download checkbox.
+     */
+    public static final String SYSTEM_CONFIGURATION_ANONYMOUS_DOWNLOAD_CHECKBOX = "system.configuration.anonymous.download.checkbox";
+
     /**
      * Id of maximize/minimize icon of table - Software module table.
      */
@@ -827,7 +832,7 @@ public final class SPUIComponetIdProvider {
      * Rollout status label id.
      */
     public static final String ROLLOUT_STATUS_LABEL_ID = "rollout.status.id";
-    
+
     /**
      * Rollout group status label id.
      */
@@ -867,12 +872,12 @@ public final class SPUIComponetIdProvider {
      * Rollout group targets count message label.
      */
     public static final String ROLLOUT_GROUP_TARGET_LABEL = "rollout.group.target.label";
-    
+
     /**
      * Action confirmation popup id.
      */
     public static final String CONFIRMATION_POPUP_ID = "action.confirmation.popup.id";
-    
+
     /**
      * Validation status icon .
      */

hawkbit-ui/src/main/resources/messages.properties

@@ -401,6 +401,8 @@ configuration.polling.title=Polling Configuration
 configuration.polling.time=Polling Time
 configuration.polling.overduetime=Polling Overdue Time
 configuration.polling.custom.value=use a custom value
+enonymous.download.title=Anonymous download
+enonymous.download.label=Allow anonymous download. If you enable this option the download server will accept anonymous download requests. 
 
 #Calendar
 calendar.year=year

hawkbit-ui/src/main/resources/messages_de.properties

@@ -389,6 +389,8 @@ configuration.defaultdistributionset.select.label=Wahl des default Distribution
 configuration.savebutton.tooltip=Konfigurationen speichern
 configuration.cancellbutton.tooltip=Konfigurationen zur<75>cksetzen
 configuration.authentication.title=Authentifikationseinstellungen
+enonymous.download.title=Anonymes herunterladen
+enonymous.download.label=Erlaube anonymes herunterladen. When diese option aktivert ist, wird der download server anonyme download anfragen erlauben.
 #Calendar
 calendar.year=Jahr
 calendar.years=Jahre