Commit Graph
100 Commits
Author SHA1 Message Date
Steffen Schaefer 9b943d6cab Added missing bundles 2019-01-17 18:29:13 +01:00
Steffen Schaefer ade77afd48 Added method that was unintentionally removed in the last merge 2019-01-17 18:02:24 +01:00
Steffen Schaefer 0a03e2718a Merge branch 'master' into permission-vertical
Conflicts:
	java/com.sap.sse.security/META-INF/MANIFEST.MF
	java/com.sap.sse.security/src/com/sap/sse/security/impl/ReplicableSecurityService.java
	java/com.sap.sse.security/src/com/sap/sse/security/impl/SecurityServiceImpl.java
	java/com.sap.sse/src/com/sap/sse/util/HttpUrlConnectionHelper.java
2019-01-17 14:13:21 +01:00
Steffen Schaefer 671b73c805 Merge branch 'master' into permission-vertical
# Conflicts:
#	java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/BranchIOConstants.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/qrcode/QRCodePlace.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/qrcode/QRCodePresenter.java
2019-01-17 13:37:54 +01:00
Steffen Schaefer 5d93f2dac0 Merge branch 'bug4720_mail' 2019-01-17 13:10:36 +01:00
Steffen Schaefer 66aa201afa Merge branch 'master' into permission-vertical
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/CopyCourseAndCompetitorsDialog.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/CourseAndCompetitorCopyOperation.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
2019-01-17 10:07:55 +01:00
Steffen Schaefer fa5127a277 Fixed compiler error 2019-01-17 10:02:46 +01:00
Steffen Schaefer c07322cc07 Reduced diff to master 2019-01-17 09:07:01 +01:00
Steffen Schaefer fc54754481 Merge branch 'master' into bug4720_mail 2019-01-17 08:52:09 +01:00
Steffen Schaefer 488cb00417 Merge branch 'permission-vertical' into bug4813 2019-01-07 09:36:56 +01:00
Steffen Schaefer f619b6d1ac Merge branch 'permission-vertical' into bug4813 2018-12-19 16:19:35 +01:00
Steffen Schaefer f0fca27721 Using instance based permission checks instead of static construction 2018-12-19 16:18:54 +01:00
Steffen Schaefer 01402229a3 Code formatting only 2018-12-19 16:17:22 +01:00
Steffen Schaefer 112ea3d75a Removed FIXME that was already done one another branch 2018-12-19 13:11:38 +01:00
Steffen Schaefer 78e6afba72 Code cleanup 2018-12-19 12:35:52 +01:00
Steffen Schaefer 3fef3cc691 Removed unused method 2018-12-19 11:10:48 +01:00
Steffen Schaefer 976b901f11 Unified permission handling in client and server 2018-12-19 10:23:40 +01:00
Steffen Schaefer c315d811e7 Removed method parameter by introducing specific handling for
ExpeditionDeviceConfiguration that has the server name included in the
type relative object identifier
2018-12-19 09:52:34 +01:00
Steffen Schaefer 4c5c51ae92 Added missing package import 2018-12-19 09:50:05 +01:00
Steffen Schaefer d412abac09 Merge branch 'permission-vertical' into bug4813
Conflicts:
	java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/TaggingServiceTest.java
2018-12-19 08:47:46 +01:00
Steffen Schaefer 637d6edda8 Added the possibility to use TypeRelativeObjectIdentifier with
WildcardPermissionBuilder
2018-12-19 08:46:36 +01:00
Steffen Schaefer 7dddae939c Fixed TaggingServiceTest that failed due to missing permissions 2018-12-19 08:42:08 +01:00
Steffen Schaefer 43b6d155e4 Merge branch 'permission-vertical' into bug4813
Conflicts:
	java/com.sap.sse.security.common/src/com/sap/sse/security/shared/dto/UserDTO.java
2018-12-19 08:31:18 +01:00
Steffen Schaefer 9a69105574 Merge branch 'master' into permission-vertical 2018-12-19 08:19:08 +01:00
Steffen Schaefer 3fb153809a Fixed updating TracTrac/SwissTiming configurations 2018-12-19 08:18:17 +01:00
Steffen Schaefer 4eaa69cec4 Further reduced size of security relevant objects 2018-12-18 19:27:56 +01:00
Steffen Schaefer 43b0bca40a Removed unnecessary generic 2018-12-18 19:27:54 +01:00
Steffen Schaefer aa16714fd5 Implemented custom serialization for UserImpl again. This should fix
deserialization of object cycles (UserImpl -> HashSet -> RoleImpl ->
UserImpl) where uninitialized objects are inserted into a HashSet.
2018-12-18 08:34:41 +01:00
Steffen Schaefer 70b036826c Merge branch 'master' into permission-vertical 2018-12-18 08:04:44 +01:00
Steffen Schaefer d46a8a7d7e Adjusted equals and hashCode implementations to conform to the
description in the JavaDocs. In addition this fixes potential problems
in the UI where we do not enforce a single instance pattern.
2018-12-17 18:00:05 +01:00
Steffen Schaefer ac40bd0128 Merge branch 'master' into permission-vertical 2018-12-17 15:45:31 +01:00
Steffen Schaefer d88c38308c Fixed ClassCastExceptions after merge that included an upgrade of the
Mongo API
2018-12-17 15:12:51 +01:00
Steffen Schaefer 52ac3f423d Fixed Typo 2018-12-17 15:04:24 +01:00
Steffen Schaefer afb9faccc2 Merge branch 'master' into permission-vertical 2018-12-17 14:37:22 +01:00
Steffen Schaefer 1e00d2d194 Merge branch 'master' into permission-vertical
# Conflicts:
#	java/com.sap.sailing.domain.persistence/META-INF/MANIFEST.MF
#	java/com.sap.sailing.domain.racelogtrackingadapter/META-INF/MANIFEST.MF
#	java/com.sap.sailing.domain.swisstimingadapter.persistence/META-INF/MANIFEST.MF
#	java/com.sap.sailing.domain.swisstimingadapter.persistence/src/com/sap/sailing/domain/swisstimingadapter/persistence/impl/SwissTimingAdapterPersistenceImpl.java
#	java/com.sap.sailing.domain.swisstimingadapter.test/META-INF/MANIFEST.MF
#	java/com.sap.sailing.domain.tractracadapter.persistence/META-INF/MANIFEST.MF
#	java/com.sap.sailing.domain.tractracadapter.persistence/src/com/sap/sailing/domain/tractracadapter/persistence/impl/MongoObjectFactoryImpl.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/DataMiningServiceImpl.java
#	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
#	java/com.sap.sailing.polars.datamining/META-INF/MANIFEST.MF
#	java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/jaxrs/AbstractJaxRsApiTest.java
#	java/com.sap.sailing.server.interface/src/com/sap/sailing/server/interfaces/RacingEventService.java
#	java/com.sap.sailing.server.replication.test/META-INF/MANIFEST.MF
#	java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackRaceReplicationTest.java
#	java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/TaggingServiceTest.java
#	java/com.sap.sailing.server.testsupport/META-INF/MANIFEST.MF
#	java/com.sap.sailing.server/META-INF/MANIFEST.MF
#	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/Activator.java
#	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
#	java/com.sap.sailing.server/src/com/sap/sailing/server/tagging/TaggingServiceImpl.java
#	java/com.sap.sse.mail.replication.testsupport/src/com/sap/sse/mail/replication/testsupport/AbstractMailServiceReplicationTest.java
#	java/com.sap.sse.security.test/META-INF/MANIFEST.MF
#	java/com.sap.sse.security.test/src/com/sap/sse/security/jaxrs/api/SecurityResourceTest.java
#	java/com.sap.sse.security.test/src/com/sap/sse/security/test/UserStoreWithPersistenceTest.java
#	java/com.sap.sse.security.userstore.mongodb/META-INF/MANIFEST.MF
#	java/com.sap.sse.security.userstore.mongodb/src/com/sap/sse/security/userstore/mongodb/MongoObjectFactory.java
#	java/com.sap.sse.security.userstore.mongodb/src/com/sap/sse/security/userstore/mongodb/impl/DomainObjectFactoryImpl.java
#	java/com.sap.sse.security.userstore.mongodb/src/com/sap/sse/security/userstore/mongodb/impl/MongoObjectFactoryImpl.java
#	java/com.sap.sse.security/src/com/sap/sse/security/impl/SecurityServiceImpl.java
2018-12-17 14:36:37 +01:00
Steffen Schaefer 6b865f3ee5 Consistently using LeaberboardGroup's UUID for security 2018-12-17 10:37:45 +01:00
Steffen Schaefer 73193acb02 Merge branch 'permission-vertical' into bug4813
Conflicts:
	java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/LeaderboardsResource.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/security/PermissionAwareRaceTrackingHandler.java
	java/com.sap.sse.security/src/com/sap/sse/security/impl/SecurityServiceImpl.java
2018-12-13 15:09:45 +01:00
Steffen Schaefer f87cef0544 Fixed CREATE_OBJECT permission checks 2018-12-13 14:06:51 +01:00
Steffen Schaefer a088fd377b When creating new TrackedRaces from REST API, the group owner of the
Regatta (if available) is also used as group owner of the resulting
TrackedRace
2018-12-13 08:36:23 +01:00
Steffen Schaefer f2d18b1f04 Added FIXME 2018-12-13 08:18:19 +01:00
Steffen Schaefer df52536e71 Merge branch 'master' into permission-vertical 2018-12-13 07:50:16 +01:00
Steffen Schaefer 19a43b95b9 Reuse temporary default tenant when tracking races 2018-12-12 17:42:00 +01:00
Steffen Schaefer ee3597d70a Removed code duplication 2018-12-12 17:38:07 +01:00
Steffen Schaefer bd93b24a58 Added the possibility to temporarily overwrite the default tenant in a
specific call
2018-12-12 16:51:53 +01:00
Steffen Schaefer b244c94538 Fixed typos 2018-12-12 16:35:27 +01:00
Steffen Schaefer 5982344848 Merge branch 'master' into permission-vertical 2018-12-12 09:22:12 +01:00
Steffen Schaefer ababe1ceea Also include Regattas when migrating group ownership in hierarchy 2018-12-11 16:04:35 +01:00
Steffen Schaefer 6427339eb3 Rollback of package import that seems to not be necessary 2018-12-10 15:47:05 +01:00
Steffen Schaefer 616a2ff430 Implemented on the fly migration of retracked TrackedRaces on server
startup to ensure that a valid Ownership exists
2018-12-10 15:38:53 +01:00
Steffen Schaefer a0069a49c2 RaceTrackers now try to stop in case of an error while creating
RaceDefinition/TrackedRace instead of silently failing and causing the
general RaceTracker timeout to be triggered
2018-12-10 14:41:26 +01:00
Steffen Schaefer d257ac3965 Initial implementation to intercept creation of RaceDefinition in case
of missing permissions
2018-12-10 10:52:59 +01:00
Steffen Schaefer 6ab0335166 Added the possibility to intercept RaceDefinition creation in race
trackers
2018-12-10 10:52:14 +01:00
Steffen Schaefer 3cc3345326 Merge branch 'master' into permission-vertical
Conflicts:
	java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/CompetitorTrackWithEstimationDataJsonSerializer.java
2018-12-10 08:53:39 +01:00
Steffen Schaefer 7fa20efb9c Merge branch 'master' into bug4720_mail 2018-12-10 08:37:23 +01:00
Steffen Schaefer c084b1d82b Removed unused method 2018-12-06 15:20:46 +01:00
Steffen Schaefer 955a483543 Simplified permissions for competitors and boats to be compatible with
the permissions granted by "user" and "sailing_viewer" roles. Further
improvements may be implemented with bug 4815
2018-12-06 14:17:13 +01:00
Steffen Schaefer ecdc56a125 Simplified UserRole permissions 2018-12-06 13:36:37 +01:00
Steffen Schaefer 92138c8c29 Added JavaDoc 2018-12-06 08:57:56 +01:00
Steffen Schaefer da730b6f0f Fixed NPE 2018-12-05 17:34:09 +01:00
Steffen Schaefer 07c411cd3a Implemented Ownership/Permission handling for TrackedRaces 2018-12-05 17:11:33 +01:00
Steffen Schaefer 1bdb7dfcfd Initially implemented the possibility to intercept TrackedRace creation
through RaceTrackers
2018-12-05 17:11:32 +01:00
Steffen Schaefer fef963a219 Removed unnecessary cast and overwritten method 2018-12-05 17:11:29 +01:00
Steffen Schaefer 4a474aeeda Merge branch 'master' into permission-vertical 2018-12-03 11:58:41 +01:00
Steffen Schaefer 9102b6a63f Removed security information from EventBaseDTO because security checks
are only needed for EventDTO instances
2018-12-03 11:58:14 +01:00
Steffen Schaefer 4df6d51069 Updated installation script for Eclipse 2018-09. Java 11 support is now
automatically added.
2018-12-03 10:43:31 +01:00
Steffen Schaefer 4b8a3c93cd Merge branch 'permission-vertical' into permission-vertical-split 2018-11-29 08:14:39 +01:00
Steffen Schaefer 85063ea7a2 Introduced new DTO for UserGroup with security info 2018-11-28 17:18:02 +01:00
Steffen Schaefer ad7f549174 Merge branch 'permission-vertical' into permission-vertical-split 2018-11-28 17:11:03 +01:00
Steffen Schaefer 5a463c7b21 Merge branch 'permission-vertical' into permission-vertical-split
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AbstractTrackedRacesListComposite.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/BoatTableWrapper.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/CompetitorTableWrapper.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/EventListComposite.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardConfigPanel.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardGroupConfigPanel.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaListComposite.java
	java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/client/component/RoleDefinitionsPanel.java
	java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/client/usermanagement/UserManagementPanel.java
2018-11-28 17:10:21 +01:00
Steffen Schaefer 54d28ee692 Enabled GSS/CSS compatibility for GWT build 2018-11-28 16:23:52 +01:00
Steffen Schaefer 8ee73a8bda Refreshing data after hierarchical group ownership updates 2018-11-28 16:02:30 +01:00
Steffen Schaefer 32125541f4 Merge branch 'permission-vertical' into permission-vertical-split 2018-11-28 14:02:39 +01:00
Steffen Schaefer 8c2026f49d Merge branch 'permission-vertical-split' of ssh://trac@sapsailing.com/home/trac/git into permission-vertical-split 2018-11-28 14:00:51 +01:00
Steffen Schaefer 6859918ea7 Merge branch 'permission-vertical' into permission-vertical-split
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/EventListComposite.java
	java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/jaxrs/AbstractJaxRsApiTest.java
	java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/RegattasResource.java
	java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/client/UserManagementService.java
	java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/client/UserManagementServiceAsync.java
	java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/client/usermanagement/UserTableWrapper.java
2018-11-28 13:59:44 +01:00
Steffen Schaefer 392cd3d682 Implemented initial ownership UI for TrackedRaces 2018-11-28 11:12:22 +01:00
Steffen Schaefer b0d4a25a41 Removed unused constructors 2018-11-28 11:12:20 +01:00
Steffen Schaefer b685769fc1 Merge branch 'master' into permission-vertical 2018-11-27 09:12:53 +01:00
Steffen Schaefer b47cdf6b6b Ui cleanup and I18n for group ownership migration dialog 2018-11-27 09:12:26 +01:00
Steffen Schaefer f64e4e3e30 Implemented copying a user group's details when migrating to a new group 2018-11-26 16:11:02 +01:00
Steffen Schaefer 994fe80206 Also include an overall leaderboard when migrating a LeaderboardGroup to
a new owner
2018-11-26 16:11:00 +01:00
Steffen Schäfer dedb37da0d First UI prototype for group owner change of event and leaderboard group
hierarchy
2018-11-22 17:02:57 +01:00
Steffen Schäfer 1d3e238771 Added serialization dummy for DataMiningService to hopefully improve
build stability of GWT compilation
2018-11-22 13:55:34 +01:00
Steffen Schäfer 0465bc48e0 Added path to shiro.ini that does not match the existing patterns 2018-11-22 08:48:47 +01:00
Steffen Schäfer bc5c8baa6b Server-side implementation to support group owner updates in the
sailing hierarchy
2018-11-21 15:52:37 +01:00
Steffen Schäfer ba83102e1b SailingViewerRole now also grants permission for public read of
competitors and boats
2018-11-21 14:32:30 +01:00
Steffen Schäfer 6d17a73692 Competitor and Boat domain types use a different set of actions
regarding permissions
2018-11-21 14:32:28 +01:00
Steffen Schäfer 8a480f8b84 Added missing @DefaultLocale for newly introduced StringMessages
interface
2018-11-21 09:58:31 +01:00
Steffen Schäfer a62767aed0 Merge branch 'master' into permission-vertical 2018-11-21 09:09:35 +01:00
Steffen Schäfer 6e7220d722 Fixed warning 2018-11-21 09:08:53 +01:00
Steffen Schäfer f020b6b7f9 Updated permission concept (e.g. regarding sharing) 2018-11-14 15:32:09 +01:00
Steffen Schäfer 9550694fee Merge branch 'master' into permission-vertical 2018-11-14 08:29:48 +01:00
Steffen Schäfer 237931333c Implemented server config updates and retrieval 2018-11-13 08:56:38 +01:00
Steffen Schäfer 4dd2cd7386 Consistently using ServerInfo.getName() to get the server name 2018-11-13 08:54:54 +01:00
Steffen Schäfer 560bf2fc2d Moved SailingViewerRole to allow access from gwt.ui bundle 2018-11-13 08:54:17 +01:00
Steffen Schäfer 43e505d74d Implemented wildcard permission check for all existing qualification
when updating an existing role
2018-11-12 17:30:17 +01:00
Steffen Schäfer 42490c4a61 Adjusted parameter type (Role vs RoleDefinition) 2018-11-12 17:30:15 +01:00
Steffen Schäfer c945c9013c Added sailing viewer role 2018-11-12 15:03:20 +01:00
Steffen Schäfer af9315f654 Added the possibility to let sse.security automatically create
RoleDefinitions from RolePrototypes provided by domain server bundles
2018-11-12 15:03:18 +01:00
Steffen Schäfer ccbd65b0a5 Using WildcardPermissionBuilder to construct complex permissions instead
of hard-coding permission strings
2018-11-12 15:03:16 +01:00
Steffen Schäfer ab86ca0d01 Added a builder to not need to construct complex permissions (e.g.
multiple types, or wildcard type) as String
2018-11-12 15:03:13 +01:00