Skip to content
Sign in

Changes

Started 2 yr 2 mo ago
Took 1.4 sec
Move the UserInfo into northbound security

The User Info class belongs with the northbound security API which is a factory for it

Signed-off-by: Tim Ward <timothyjward@apache.org>
(commit: e12ff02)
core/api/src/main/java/org/eclipse/sensinact/core/security/UserInfo.java northbound/security/openid-connect/src/main/java/org/eclipse/sensinact/gateway/northbound/security/oidc/JwsUserInfo.java northbound/websocket/pom.xml northbound/session/session-impl/src/main/java/org/eclipse/sensinact/nortbound/session/impl/SensiNactSessionImpl.java northbound/session/session-impl/src/test/java/org/eclipse/sensinact/nortbound/session/integration/SensinactSessionTest.java northbound/session/session-api/src/main/java/org/eclipse/sensinact/northbound/session/SensiNactSession.java northbound/websocket/integration-test.bndrun northbound/session/session-api/pom.xml northbound/security/security-api/src/main/java/org/eclipse/sensinact/northbound/security/api/UserInfo.java southbound/http/http-device-factory/integration-test.bndrun northbound/sensorthings/rest.gateway/src/main/java/org/eclipse/sensinact/sensorthings/sensing/rest/impl/SensinactSessionProvider.java northbound/rest/src/main/java/org/eclipse/sensinact/northbound/rest/impl/AuthenticationFilter.java distribution/features/northbound-ogc-sensorthings-mqtt-feature/src/main/resources/northbound-ogc-sensorthings-mqtt-feature.json northbound/websocket/src/main/java/org/eclipse/sensinact/northbound/ws/impl/WebSocketCreator.java southbound/mqtt/mqtt-device-factory/src/test/java/org/eclipse/sensinact/gateway/southbound/mqtt/factory/integration/MqttDeviceFactoryTest.java northbound/security/openid-connect/pom.xml northbound/security/authentication-api/pom.xml northbound/security/security-api/pom.xml distribution/features/northbound-oidc-authenticator-feature/pom.xml northbound/query-handler/integration-test.bndrun northbound/security/openid-connect/src/main/java/org/eclipse/sensinact/gateway/northbound/security/oidc/OIDCTokenValidator.java northbound/sensorthings/rest.gateway/integration-test.bndrun southbound/mqtt/mqtt-device-factory/integration-test.bndrun northbound/security/pom.xml northbound/query-handler/src/test/java/org/eclipse/sensinact/northbound/query/test/integration/MissingEntityTest.java northbound/rest/src/test/java/org/eclipse/sensinact/northbound/rest/integration/notification/ResourceNotificationsTest.java northbound/security/authentication-api/src/main/java/org/eclipse/sensinact/northbound/security/api/package-info.java southbound/virtual/virtual-temperature-sensor/src/test/java/org/eclipse/sensinact/gateway/southbound/virtual/temperature/integration/TemperatureSensorTest.java southbound/http/http-device-factory/src/test/java/org/eclipse/sensinact/gateway/southbound/http/factory/integration/HttpDeviceFactorySSLTest.java northbound/query-handler/src/test/java/org/eclipse/sensinact/northbound/query/test/integration/DescriptionsTest.java northbound/sensorthings/rest.gateway/src/test/java/org/eclipse/sensinact/sensorthings/sensing/rest/integration/AbstractIntegrationTest.java northbound/session/session-impl/src/main/java/org/eclipse/sensinact/nortbound/session/impl/SessionManager.java northbound/rest/integration-test.bndrun distribution/features/northbound-rest-feature/pom.xml northbound/rest/src/test/java/org/eclipse/sensinact/northbound/rest/integration/ResourceAccessTest.java northbound/session/session-api/src/main/java/org/eclipse/sensinact/northbound/session/SensiNactSessionManager.java northbound/rest/src/main/java/org/eclipse/sensinact/northbound/rest/impl/SensinactSessionProvider.java northbound/websocket/src/main/java/org/eclipse/sensinact/northbound/ws/impl/WebSocketJettyRegistrar.java northbound/query-handler/src/test/java/org/eclipse/sensinact/northbound/query/test/integration/ResourceAccessTest.java southbound/http/http-device-factory/src/test/java/org/eclipse/sensinact/gateway/southbound/http/factory/integration/HttpDeviceFactoryTest.java distribution/features/northbound-ogc-sensorthings-feature/pom.xml northbound/security/security-api/src/main/java/org/eclipse/sensinact/northbound/security/api/package-info.java southbound/http/http-device-factory/src/test/java/org/eclipse/sensinact/gateway/southbound/http/factory/integration/HttpDeviceFactoryAuthTest.java northbound/session/session-impl/src/test/java/org/eclipse/sensinact/nortbound/session/integration/SessionSubscribeTest.java northbound/security/security-api/src/main/java/org/eclipse/sensinact/northbound/security/api/Authenticator.java southbound/http/http-device-factory/src/test/java/org/eclipse/sensinact/gateway/southbound/http/factory/integration/HttpDeviceFactoryParallelQueries.java distribution/features/northbound-ogc-sensorthings-mqtt-feature/pom.xml distribution/features/northbound-rest-feature/src/main/resources/northbound-rest-feature.json northbound/websocket/src/test/java/org/eclipse/sensinact/northbound/websocket/integration/SecureWebSocketTest.java northbound/rest/pom.xml distribution/features/northbound-ogc-sensorthings-feature/src/main/resources/northbound-ogc-sensorthings-feature.json northbound/security/openid-connect/integration-test.bndrun northbound/security/authentication-api/src/main/java/org/eclipse/sensinact/northbound/security/api/Authenticator.java northbound/rest/src/test/java/org/eclipse/sensinact/northbound/rest/integration/SecureAccessTest.java southbound/virtual/virtual-temperature-sensor/integration-test.bndrun northbound/security/openid-connect/src/test/java/org/eclipse/sensinact/gateway/northbound/security/oidc/integration/ValidatorTest.java core/api/src/main/java/org/eclipse/sensinact/core/security/package-info.java distribution/features/northbound-oidc-authenticator-feature/src/main/resources/northbound-oidc-authenticator-feature.json
timothyjward at
Introduce authorization checks in the Session API

* Include a configurable default fallback to allow all, allow authenticated only, or forbid all
* Apply as many checks as possible prior to accessing the gateway thread

Signed-off-by: Tim Ward <timothyjward@apache.org>
(commit: dab4465)
northbound/session/session-impl/src/main/java/org/eclipse/sensinact/nortbound/session/impl/DefaultSessionAuthorizationEngine.java southbound/virtual/virtual-temperature-sensor/src/test/java/org/eclipse/sensinact/gateway/southbound/virtual/temperature/integration/TemperatureSensorTest.java northbound/session/session-impl/src/main/java/org/eclipse/sensinact/nortbound/session/impl/DefaultAuthPolicy.java northbound/session/session-impl/src/main/java/org/eclipse/sensinact/nortbound/session/impl/DenyAllAuthorizer.java northbound/query-handler/src/test/java/org/eclipse/sensinact/northbound/query/test/integration/ResourceAccessTest.java northbound/sensorthings/rest.gateway/src/test/java/org/eclipse/sensinact/sensorthings/sensing/rest/integration/AbstractIntegrationTest.java northbound/rest/src/main/java/org/eclipse/sensinact/northbound/rest/impl/RestAccessApplication.java northbound/query-handler/src/test/java/org/eclipse/sensinact/northbound/query/test/integration/MissingEntityTest.java northbound/websocket/src/test/java/org/eclipse/sensinact/northbound/websocket/integration/SecureWebSocketTest.java northbound/sensorthings/rest.gateway/src/test/java/org/eclipse/sensinact/sensorthings/sensing/rest/integration/ObservationHistoryTest.java northbound/session/session-impl/pom.xml core/impl/src/main/java/org/eclipse/sensinact/core/command/impl/GatewayThreadImpl.java pom.xml northbound/rest/src/test/java/org/eclipse/sensinact/northbound/rest/integration/SecureAccessTest.java southbound/http/http-device-factory/integration-test.bndrun northbound/query-handler/integration-test.bndrun northbound/session/session-impl/src/test/java/org/eclipse/sensinact/nortbound/session/integration/SessionSubscribeTest.java southbound/mqtt/mqtt-device-factory/src/test/java/org/eclipse/sensinact/gateway/southbound/mqtt/factory/integration/MqttDeviceFactoryTest.java northbound/rest/src/test/java/org/eclipse/sensinact/northbound/rest/integration/DescriptionsTest.java northbound/websocket/src/test/java/org/eclipse/sensinact/northbound/websocket/integration/WebSocketTest.java southbound/http/http-device-factory/src/test/java/org/eclipse/sensinact/gateway/southbound/http/factory/integration/HttpDeviceFactoryTest.java northbound/rest/src/test/java/org/eclipse/sensinact/northbound/rest/integration/ResourceAccessTest.java northbound/session/session-impl/src/main/java/org/eclipse/sensinact/nortbound/session/impl/SensiNactSessionImpl.java southbound/virtual/virtual-temperature-sensor/integration-test.bndrun core/impl/integration-test.bndrun northbound/rest/src/test/java/org/eclipse/sensinact/northbound/rest/integration/notification/ResourceNotificationsTest.java northbound/session/session-impl/src/test/java/org/eclipse/sensinact/nortbound/session/impl/DefaultSessionAuthorizationEngineTests.java northbound/session/session-impl/src/test/java/org/eclipse/sensinact/nortbound/session/integration/SensinactSessionTest.java northbound/session/session-impl/src/main/java/org/eclipse/sensinact/nortbound/session/impl/AllowAllAuthorizer.java distribution/features/northbound-oidc-authenticator-feature/src/it/resources/config/configuration.json distribution/features/timescale-history-provider-feature/src/it/resources/config/configuration.json northbound/session/session-impl/src/test/java/org/eclipse/sensinact/nortbound/session/impl/TestUserInfo.java southbound/http/http-device-factory/src/test/java/org/eclipse/sensinact/gateway/southbound/http/factory/integration/HttpDeviceFactorySSLTest.java northbound/session/session-impl/integration-test.bndrun northbound/query-handler/src/test/java/org/eclipse/sensinact/northbound/query/test/integration/DescriptionsTest.java northbound/rest/src/test/java/org/eclipse/sensinact/northbound/rest/integration/MissingEntityTest.java southbound/http/http-device-factory/src/test/java/org/eclipse/sensinact/gateway/southbound/http/factory/integration/HttpDeviceFactoryAuthTest.java distribution/features/virtual-temperature-sensor-feature/src/it/resources/config/configuration.json northbound/security/security-api/src/main/java/org/eclipse/sensinact/northbound/security/api/AuthorizationEngine.java southbound/http/http-device-factory/src/test/java/org/eclipse/sensinact/gateway/southbound/http/factory/integration/HttpDeviceFactoryParallelQueries.java northbound/session/session-impl/src/main/java/org/eclipse/sensinact/nortbound/session/impl/SessionManager.java
timothyjward at
Lint checking fixes

Spacing tidy up and adding a missing license header

Signed-off-by: Tim Ward <timothyjward@apache.org>
(commit: a918712)
northbound/session/session-impl/src/main/java/org/eclipse/sensinact/nortbound/session/impl/SensiNactSessionImpl.java distribution/features/virtual-temperature-sensor-feature/src/it/resources/config/configuration.json core/api/src/main/java/org/eclipse/sensinact/core/twin/SensinactProvider.java core/impl/src/main/java/org/eclipse/sensinact/core/model/nexus/ModelNexus.java northbound/session/session-impl/src/main/java/org/eclipse/sensinact/nortbound/session/impl/DenyAllAuthorizer.java northbound/rest/src/test/java/org/eclipse/sensinact/northbound/rest/integration/SecureAccessTest.java northbound/rest/src/test/java/org/eclipse/sensinact/northbound/rest/integration/ResourceAccessTest.java northbound/session/session-impl/src/main/java/org/eclipse/sensinact/nortbound/session/impl/DefaultSessionAuthorizationEngine.java northbound/session/session-impl/src/test/java/org/eclipse/sensinact/nortbound/session/impl/DefaultSessionAuthorizationEngineTests.java northbound/security/security-api/src/main/java/org/eclipse/sensinact/northbound/security/api/AuthorizationEngine.java northbound/session/session-impl/src/test/java/org/eclipse/sensinact/nortbound/session/impl/TestUserInfo.java northbound/session/session-impl/src/main/java/org/eclipse/sensinact/nortbound/session/impl/DefaultAuthPolicy.java northbound/session/session-impl/src/test/java/org/eclipse/sensinact/nortbound/session/integration/SessionSubscribeTest.java northbound/session/session-impl/src/main/java/org/eclipse/sensinact/nortbound/session/impl/AllowAllAuthorizer.java northbound/session/session-impl/src/test/java/org/eclipse/sensinact/nortbound/session/integration/SensinactSessionTest.java core/impl/src/main/java/org/eclipse/sensinact/core/twin/impl/SensinactDigitalTwinImpl.java northbound/sensorthings/rest.gateway/src/test/java/org/eclipse/sensinact/sensorthings/sensing/rest/integration/ObservationHistoryTest.java northbound/sensorthings/rest.gateway/src/test/java/org/eclipse/sensinact/sensorthings/sensing/rest/integration/AbstractIntegrationTest.java northbound/session/session-impl/src/main/java/org/eclipse/sensinact/nortbound/session/impl/SessionManager.java
timothyjward at
Make the sensiNact build more CI friendly

Since Maven 3.5.0 poms have had the ability to be [CI-friendly](https://maven.apache.org/maven-ci-friendly.html) allowing a more flexible approach to releasing without the need to edit POM files. This also impacts the creation of our feature files, which can now flexibly alter the versions of the bundles they deploy to match what's being built in by CI. The end result should be a much simpler time when we want to tag or release any particular commit.

Signed-off-by: Tim Ward <timothyjward@apache.org>
(commit: 75ebfda)
northbound/gogo-shell/pom.xml examples/action/pom.xml examples/pom.xml sensinact-bom/pom.xml southbound/mqtt/pom.xml core/models/metadata/pom.xml northbound/session/session-api/pom.xml examples/notification/pom.xml northbound/sensorthings/rest.api/pom.xml distribution/features/northbound-oidc-authenticator-feature/pom.xml distribution/launcher/pom.xml northbound/filters/ldap/pom.xml distribution/features/virtual-temperature-sensor-feature/src/main/resources/virtual-temperature-sensor-feature.json southbound/device-factory/parser-csv/pom.xml distribution/features/northbound-ogc-sensorthings-feature/src/main/resources/northbound-ogc-sensorthings-feature.json distribution/pom.xml northbound/sensorthings/pom.xml southbound/http/http-device-factory/pom.xml northbound/filters/pom.xml northbound/rest/pom.xml core/models/pom.xml examples/push-based/pom.xml distribution/test-utils/pom.xml distribution/features/jakarta-servlet-whiteboard-feature/pom.xml distribution/assembly/pom.xml northbound/sensorthings/mqtt/pom.xml distribution/features/northbound-ogc-sensorthings-mqtt-feature/src/main/resources/northbound-ogc-sensorthings-mqtt-feature.json core/emf-api/pom.xml examples/generic/pom.xml southbound/history/timescale-provider/pom.xml southbound/mqtt/mqtt-client/pom.xml northbound/pom.xml distribution/features/northbound-websocket-feature/pom.xml distribution/features/gogo-shell-feature/pom.xml core/models/provider/pom.xml distribution/features/core-feature/src/main/resources/core-feature.json examples/writable/pom.xml southbound/pom.xml distribution/features/northbound-oidc-authenticator-feature/src/main/resources/northbound-oidc-authenticator-feature.json distribution/features/northbound-ogc-sensorthings-mqtt-feature/pom.xml distribution/features/jakarta-rest-whiteboard-feature/src/main/resources/jakarta-rest-whiteboard-feature.json distribution/features/jakarta-rest-whiteboard-feature/pom.xml northbound/filters/filters.core/pom.xml southbound/device-factory/pom.xml southbound/virtual/pom.xml northbound/security/pom.xml northbound/sensorthings/filter/pom.xml southbound/http/http-callback-whiteboard/pom.xml northbound/security/security-api/pom.xml core/impl/pom.xml examples/reflective/pom.xml northbound/sensorthings/rest.gateway/pom.xml southbound/virtual/virtual-temperature-sensor/pom.xml distribution/features/northbound-rest-feature/pom.xml northbound/sensorthings/dto/pom.xml southbound/history/history-api/pom.xml southbound/mqtt/mqtt-device-factory/pom.xml core/geo-json/pom.xml examples/model-based/pom.xml northbound/query-handler/pom.xml southbound/http/pom.xml distribution/features/northbound-rest-feature/src/main/resources/northbound-rest-feature.json distribution/features/gogo-shell-feature/src/main/resources/gogo-shell-feature.json northbound/websocket/pom.xml distribution/features/timescale-history-provider-feature/src/main/resources/timescale-history-provider-feature.json core/api/pom.xml distribution/features/timescale-history-provider-feature/pom.xml distribution/features/pom.xml core/annotation/pom.xml distribution/features/virtual-temperature-sensor-feature/pom.xml northbound/session/session-impl/pom.xml southbound/device-factory/parser-json/pom.xml southbound/history/pom.xml northbound/session/pom.xml pom.xml distribution/features/northbound-ogc-sensorthings-feature/pom.xml distribution/features/core-feature/pom.xml southbound/device-factory/device-factory-core/pom.xml distribution/features/jakarta-servlet-whiteboard-feature/src/main/resources/jakarta-servlet-whiteboard-feature.json northbound/security/openid-connect/pom.xml core/pom.xml distribution/features/northbound-websocket-feature/src/main/resources/northbound-websocket-feature.json examples/pull-based/pom.xml
timothyjward at