diff --git a/hawkbit-runtime/docker/docker-compose-micro-services-mysql.yml b/hawkbit-runtime/docker/docker-compose-micro-services-mysql.yml index 85fb1c109..78b7d9ae3 100644 --- a/hawkbit-runtime/docker/docker-compose-micro-services-mysql.yml +++ b/hawkbit-runtime/docker/docker-compose-micro-services-mysql.yml @@ -12,6 +12,7 @@ version: '3.7' include: - docker-compose-deps-mysql.yml +# EXPERIMENTAL! services: # --------------------- diff --git a/hawkbit-runtime/hawkbit-ddi-server/README.md b/hawkbit-runtime/hawkbit-ddi-server/README.md index 208da1071..b88594dfc 100644 --- a/hawkbit-runtime/hawkbit-ddi-server/README.md +++ b/hawkbit-runtime/hawkbit-ddi-server/README.md @@ -1,4 +1,4 @@ -# hawkBit DDI Server +# hawkBit DDI Server (EXPERIMENTAL!) The hawkBit DDI Server is a standalone spring-boot application with an embedded servlet container. It should be started with at least hawkbit-mgmt-server. ## On your own workstation diff --git a/hawkbit-runtime/hawkbit-ddi-server/src/main/java/org/eclipse/hawkbit/app/ddi/DDIStart.java b/hawkbit-runtime/hawkbit-ddi-server/src/main/java/org/eclipse/hawkbit/app/ddi/DDIStart.java index eb1875ee6..bc3eebd8d 100644 --- a/hawkbit-runtime/hawkbit-ddi-server/src/main/java/org/eclipse/hawkbit/app/ddi/DDIStart.java +++ b/hawkbit-runtime/hawkbit-ddi-server/src/main/java/org/eclipse/hawkbit/app/ddi/DDIStart.java @@ -12,6 +12,9 @@ package org.eclipse.hawkbit.app.ddi; import org.eclipse.hawkbit.autoconfigure.security.EnableHawkbitManagedSecurityConfiguration; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; +import org.springframework.security.config.annotation.method.configuration.GlobalMethodSecurityConfiguration; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.servlet.mvc.support.RedirectAttributes; @@ -46,4 +49,10 @@ public class DDIStart { return new RedirectView("swagger-ui/index.html"); } } + + @Configuration + @EnableGlobalMethodSecurity(prePostEnabled = true, securedEnabled = true, proxyTargetClass = true) + public static class MethodSecurityConfig extends GlobalMethodSecurityConfiguration { + + } } diff --git a/hawkbit-runtime/hawkbit-dmf-server/README.md b/hawkbit-runtime/hawkbit-dmf-server/README.md index cc546e90a..58c78e185 100644 --- a/hawkbit-runtime/hawkbit-dmf-server/README.md +++ b/hawkbit-runtime/hawkbit-dmf-server/README.md @@ -1,4 +1,4 @@ -# hawkBit DMF Server +# hawkBit DMF Server (EXPERIMENTAL!) The hawkBit DMF Server is a standalone spring-boot application with an embedded servlet container. It should be started with at least hawkbit-mgmt-server. ## On your own workstation diff --git a/hawkbit-runtime/hawkbit-mgmt-server/README.md b/hawkbit-runtime/hawkbit-mgmt-server/README.md index 2fa863e98..3fd6abdb9 100644 --- a/hawkbit-runtime/hawkbit-mgmt-server/README.md +++ b/hawkbit-runtime/hawkbit-mgmt-server/README.md @@ -1,4 +1,4 @@ -# hawkBit Management Server +# hawkBit Management Server (EXPERIMENTAL!) The hawkBit Management Server is a standalone spring-boot application with an embedded servlet container. It should be started with at least one (or both) of the device interface servers - hawkbit-ddi-server or/and hawkbit-dmf-server. ## On your own workstation diff --git a/hawkbit-runtime/hawkbit-mgmt-server/src/main/java/org/eclipse/hawkbit/app/mgmt/MgmtServerStart.java b/hawkbit-runtime/hawkbit-mgmt-server/src/main/java/org/eclipse/hawkbit/app/mgmt/MgmtServerStart.java index 3881d1461..5ca89511d 100644 --- a/hawkbit-runtime/hawkbit-mgmt-server/src/main/java/org/eclipse/hawkbit/app/mgmt/MgmtServerStart.java +++ b/hawkbit-runtime/hawkbit-mgmt-server/src/main/java/org/eclipse/hawkbit/app/mgmt/MgmtServerStart.java @@ -12,6 +12,9 @@ package org.eclipse.hawkbit.app.mgmt; import org.eclipse.hawkbit.autoconfigure.security.EnableHawkbitManagedSecurityConfiguration; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; +import org.springframework.security.config.annotation.method.configuration.GlobalMethodSecurityConfiguration; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.servlet.mvc.support.RedirectAttributes; @@ -46,4 +49,10 @@ public class MgmtServerStart { return new RedirectView("swagger-ui/index.html"); } } + + @Configuration + @EnableGlobalMethodSecurity(prePostEnabled = true, securedEnabled = true, proxyTargetClass = true) + public static class MethodSecurityConfig extends GlobalMethodSecurityConfiguration { + + } } diff --git a/hawkbit-runtime/hawkbit-vv8-ui/README.md b/hawkbit-runtime/hawkbit-vv8-ui/README.md index 2b56b0c7b..24b8e1a08 100644 --- a/hawkbit-runtime/hawkbit-vv8-ui/README.md +++ b/hawkbit-runtime/hawkbit-vv8-ui/README.md @@ -1,4 +1,4 @@ -# hawkBit Vaadin 8 UI (Deprecated) +# hawkBit Vaadin 8 UI (EXPERIMENTAL and already DEPRECATED!) The hawkBit Vaadin v8 UI is a standalone spring-boot application with an embedded servlet container. It should be started with at least hawkbit-mgmt-server. ## On your own workstation