Commit Graph

45 Commits

Author SHA1 Message Date
Michael Hirsch
a11d2bc7f5 Merge branch 'master' into feature_security_adaptions 2016-06-22 15:49:14 +02:00
Michael Hirsch
11f2232247 add prefixed ROLE_ to granted authorities to work with out-of-the-box
spring security

Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-06-22 15:47:38 +02:00
Michael Hirsch
9226f514d2 add spring security eval expression for system_monitor permission
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-06-22 13:36:22 +02:00
SirWayne
c76bca3c41 Add Javadoc and fix typo
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-06-15 13:12:59 +02:00
SirWayne
1b4d73bd13 Merge branch 'master' into feature_rollouts_credentials
Conflicts:
	hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/artifacts/upload/UploadStatusObject.java


Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-06-15 09:53:06 +02:00
Dominic Schabel
06ccd125f9 Year of licence header fixed.
Signed-off-by: Dominic Schabel <dominic.schabel@bosch-si.com>
2016-06-10 13:11:12 +02:00
Dominic Schabel
93ce7e9bf4 Constant for security log prefix introduced.
Signed-off-by: Dominic Schabel <dominic.schabel@bosch-si.com>
2016-06-10 10:59:45 +02:00
SirWayne
ed8827726c Refactor auditore aware
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-06-09 17:31:34 +02:00
SirWayne
9c7f48ded5 Merge branch 'master' into feature_rollouts_credentials
Conflicts:
	hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/security/SecurityAutoConfiguration.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/RepositoryApplicationConfiguration.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/ArtifactManagement.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/DeploymentManagement.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/DistributionSetManagement.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/ReportManagement.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/RolloutGroupManagement.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/RolloutManagement.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/SoftwareManagement.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/SystemManagement.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/TagManagement.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/TargetFilterQueryManagement.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/TargetManagement.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/TenantConfigurationManagement.java
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/TenantStatsManagement.java


Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-06-06 10:35:02 +02:00
Kai Zimmermann
e71ab4e63f Ip Address tracking configurable.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-06-04 21:11:19 +02:00
SirWayne
5d4de130b4 Fix license header
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-06-02 13:45:56 +02:00
SirWayne
afbea77310 Add Permission Unit Test
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-06-02 11:07:49 +02:00
Kai Zimmermann
5d17a7d5c3 Added sonar exceptions.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-06-02 08:50:37 +02:00
SirWayne
f8538853ed Add method all permissions
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-06-01 13:12:53 +02:00
Kai Zimmermann
f2e13b8d22 Split into separate maven modules.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-05-25 17:43:57 +02:00
Michael Hirsch
56487ad1b7 remove if-statement and return immediately the instanceof result
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-05-17 10:57:08 +02:00
Michael Hirsch
7a281a8236 allow the getTargetSecurityToken can be called as system code
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-05-13 15:38:52 +02:00
Kai Zimmermann
882c689a51 Migrated sonar false positives from qube into code.
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
2016-05-04 12:13:26 +02:00
Michael Hirsch
1cb7519ace add security and filters for anonymous download via http and amqp
requests

Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-03-23 16:17:53 +01:00
Kai Zimmermann
f5352b420d Cleaned up a bit 2016-03-15 13:22:43 +01:00
SirWayne
ed97031faf Merge branch 'master' into
feature_MECS-86_tenant_specific_polling_configuration

Conflicts:
	hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/security/SecurityManagedConfiguration.java
	hawkbit-core/src/main/java/org/eclipse/hawkbit/tenancy/configuration/TenantConfigurationKey.java
	hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpControllerAuthentfication.java
	hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpControllerAuthentficationTest.java
	hawkbit-repository/src/test/resources/application-test.properties


Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-03-09 13:29:40 +01:00
Kai Zimmermann
dcea53f4c8 Merge remote-tracking branch 'eclipse/master' into harmonize-test-documentation 2016-03-04 18:14:26 +01:00
Kai Zimmermann
25832e7e16 Merge remote-tracking branch 'eclipse/master' into cleanup-properties
# Conflicts:
#
hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpProperties.j
ava
2016-03-04 12:11:35 +01:00
Kai Zimmermann
71653470dc Merge remote-tracking branch 'eclipse/master' into harmonize-test-documentation 2016-03-03 20:59:15 +01:00
Michael Hirsch
4ca1bdf9ef fix tests by setting the SystemSecurityContext to prevent NPE in tests
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-02-29 13:19:08 +01:00
Fabian Nonnenmacher
6a88f2a3f4 Added Permission for TenantConfiguration changes
- created SpringEvalExpression for the right to change tenant configuration
- added this authorization filter to every tenant configuration related method

Signed-off-by: Nonnenmacher Fabian <fabian.nonnenmacher@bosch-si.com>
2016-02-29 13:17:13 +01:00
SirWayne
895a78fee8 Merge branch 'master' into Multiple_VHost_Connection
Conflicts:
	hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpMessageHandlerServiceTest.java
	hawkbit-security-core/src/test/java/org/eclipse/hawkbit/util/IpUtilTest.java


Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-02-29 12:41:52 +01:00
Kai Zimmermann
7692a29918 Fixed property bean setup 2016-02-25 20:36:17 +01:00
Kai Zimmermann
ab18e12b69 Completed migration to ConfigurationProperties annotation. Added boot metadata generation to build. 2016-02-25 17:59:46 +01:00
Michael Hirsch
f969d6f4c2 clean code refactorings
- add description to assertions in unit tests
- make inner classes static
- remove out-commented code

Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-02-25 14:38:25 +01:00
Kai Zimmermann
0b8e693cec Migrated environment aware to property annotation mechanism, documented properties. 2016-02-25 11:36:21 +01:00
Kai Zimmermann
623c980b7b Completed feature stories annotations 2016-02-24 08:31:05 +01:00
Kai Zimmermann
204fe1fd18 Created TODOs for missing descriptions 2016-02-23 20:53:21 +01:00
Kai Zimmermann
7f2a9d1ed2 Features harmonised, more test descriptions 2016-02-23 09:57:18 +01:00
SirWayne
b4421e7e44 Add JavaDoc, refactor staff for clean code convention and modify unit
tests

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-02-16 12:24:33 +01:00
SirWayne
91dfbbd3a6 Extract exchange from URI
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-02-15 16:48:02 +01:00
SirWayne
c737614e9b Add sender service to customize sending messages
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-02-15 08:55:44 +01:00
Kai Zimmermann
0aa254b45c Merge pull request #24 from bsinno/rollout_mgmt
Looks good, merged
2016-02-04 18:47:35 +01:00
Michael Hirsch
f18825ce34 Initial Contribution of the rollout-management feature
- Repository functionality for rollout, rolloutgroup entities
- Rollout scheduler to watch and handle running rollouts and start next
group of rollout
- Vaadin view to administrate rollouts and reflect the current rollout
status
- REST resources to cover rollout creation, updating, starting, pausing
and resuming

Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-02-04 15:10:44 +01:00
Michael Hirsch
d55e521701 fixing security properties for anonymous enabled, adding javadoc
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
2016-02-02 17:32:10 +01:00
SirWayne
877cb1ee24 Remove @Value annotation and use inner configuration properties to set
the default value.

Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
2016-01-28 15:29:31 +01:00
Michael Hirsch
a27a770b6a removing the default value from the @Value annotation, seems like is not
working overwriting the default value with profiles. Removing the
default value, it is possible again to overwrite the default value
again.
2016-01-28 10:35:26 +01:00
Kai Zimmermann
2f0bf6629f Reapplied hawkBit code formatter.
It seems that from Luna to Mars Eclipse changed how the code formatter
handles lines breaks in certain cases. This is now the “Mars” variant.
2016-01-27 10:12:11 +01:00
Kai Zimmermann
64deaeea3c Remove swagger and minor feature extensions and bug fixes
- Various Bug fixes and improvements
- Management API extended
- Swagger removed
- Guava Upgraded to 19
2016-01-21 13:42:38 +01:00
Kai Zimmermann
7497ab61ed Initial check in accordance with Parallel IP 2016-01-21 13:18:55 +01:00