You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ri...@apache.org on 2022/10/19 12:17:22 UTC
[incubator-streampipes] branch STREAMPIPES-598 updated (1b98ccfac -> 8ef976e0a)
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a change to branch STREAMPIPES-598
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
from 1b98ccfac [STREAMPIPES-598] Add breadcrumb navigation to adapter details view
new e12b8e84d [STREAMPIPES-598] Support authenticated monitoring requests
new 8ef976e0a [STREAMPIPES-598] Disable adapter details overview for now
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../manager/execution/http/HttpRequestBuilder.java | 30 +---------
.../pipeline/ExtensionsServiceLogExecutor.java | 14 ++++-
.../streampipes/manager/util/AuthTokenUtils.java | 65 ++++++++++++++++++++++
.../resource/management/UserResourceManager.java | 8 +++
.../user/management/jwt/JwtTokenProvider.java | 3 +-
.../user/management/util/UserInfoUtil.java | 30 ++++++++--
.../adapter-details/adapter-details-tabs.ts | 2 +-
.../existing-adapters.component.ts | 2 +-
ui/src/app/connect/connect.module.ts | 8 +--
9 files changed, 121 insertions(+), 41 deletions(-)
create mode 100644 streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/util/AuthTokenUtils.java
[incubator-streampipes] 02/02: [STREAMPIPES-598] Disable adapter details overview for now
Posted by ri...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch STREAMPIPES-598
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit 8ef976e0a3ff9b42c1cfb6a1780371506085059d
Author: Dominik Riemer <do...@gmail.com>
AuthorDate: Wed Oct 19 14:17:05 2022 +0200
[STREAMPIPES-598] Disable adapter details overview for now
---
.../connect/components/adapter-details/adapter-details-tabs.ts | 2 +-
.../components/existing-adapters/existing-adapters.component.ts | 2 +-
ui/src/app/connect/connect.module.ts | 8 ++++----
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ui/src/app/connect/components/adapter-details/adapter-details-tabs.ts b/ui/src/app/connect/components/adapter-details/adapter-details-tabs.ts
index 88596c8d1..518b887bd 100644
--- a/ui/src/app/connect/components/adapter-details/adapter-details-tabs.ts
+++ b/ui/src/app/connect/components/adapter-details/adapter-details-tabs.ts
@@ -22,7 +22,7 @@ export class SpAdapterDetailsTabs {
public getTabs(elementId: string): SpNavigationItem[] {
return [
- {itemId: 'overview', itemTitle: 'Overview', itemLink: ['connect', 'details', elementId, 'overview']},
+ //{itemId: 'overview', itemTitle: 'Overview', itemLink: ['connect', 'details', elementId, 'overview']},
{itemId: 'metrics', itemTitle: 'Metrics', itemLink: ['connect', 'details', elementId, 'metrics']},
{itemId: 'logs', itemTitle: 'Logs', itemLink: ['connect', 'details', elementId, 'logs']}
];
diff --git a/ui/src/app/connect/components/existing-adapters/existing-adapters.component.ts b/ui/src/app/connect/components/existing-adapters/existing-adapters.component.ts
index a87204fd6..1c1c01b38 100644
--- a/ui/src/app/connect/components/existing-adapters/existing-adapters.component.ts
+++ b/ui/src/app/connect/components/existing-adapters/existing-adapters.component.ts
@@ -203,7 +203,7 @@ export class ExistingAdaptersComponent implements OnInit {
}
navigateToDetailsOverviewPage(adapter: AdapterDescriptionUnion): void {
- this.router.navigate(['connect', 'details', adapter.elementId, 'overview']);
+ this.router.navigate(['connect', 'details', adapter.elementId, 'metrics']);
}
}
diff --git a/ui/src/app/connect/connect.module.ts b/ui/src/app/connect/connect.module.ts
index b6a2d2e1d..cb247216a 100644
--- a/ui/src/app/connect/connect.module.ts
+++ b/ui/src/app/connect/connect.module.ts
@@ -157,10 +157,10 @@ import { SpAdapterDetailsMetricsComponent } from './components/adapter-details/a
path: 'edit/:elementId',
component: EditAdapterComponent,
},
- {
- path: 'details/:elementId/overview',
- component: SpAdapterDetailsOverviewComponent
- },
+ // {
+ // path: 'details/:elementId/overview',
+ // component: SpAdapterDetailsOverviewComponent
+ // },
{
path: 'details/:elementId/metrics',
component: SpAdapterDetailsMetricsComponent
[incubator-streampipes] 01/02: [STREAMPIPES-598] Support authenticated monitoring requests
Posted by ri...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch STREAMPIPES-598
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit e12b8e84d309600e7c0ad9627644e41a2c936132
Author: Dominik Riemer <do...@gmail.com>
AuthorDate: Wed Oct 19 14:06:30 2022 +0200
[STREAMPIPES-598] Support authenticated monitoring requests
---
.../manager/execution/http/HttpRequestBuilder.java | 30 +---------
.../pipeline/ExtensionsServiceLogExecutor.java | 14 ++++-
.../streampipes/manager/util/AuthTokenUtils.java | 65 ++++++++++++++++++++++
.../resource/management/UserResourceManager.java | 8 +++
.../user/management/jwt/JwtTokenProvider.java | 3 +-
.../user/management/util/UserInfoUtil.java | 30 ++++++++--
6 files changed, 115 insertions(+), 35 deletions(-)
diff --git a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/execution/http/HttpRequestBuilder.java b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/execution/http/HttpRequestBuilder.java
index 1dae7b566..4dd5184e9 100644
--- a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/execution/http/HttpRequestBuilder.java
+++ b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/execution/http/HttpRequestBuilder.java
@@ -22,17 +22,12 @@ import com.google.gson.JsonSyntaxException;
import org.apache.http.client.fluent.Request;
import org.apache.http.client.fluent.Response;
import org.apache.http.entity.ContentType;
+import org.apache.streampipes.manager.util.AuthTokenUtils;
import org.apache.streampipes.model.base.NamedStreamPipesEntity;
-import org.apache.streampipes.model.client.user.Permission;
-import org.apache.streampipes.model.client.user.Principal;
import org.apache.streampipes.model.pipeline.PipelineElementStatus;
-import org.apache.streampipes.resource.management.SpResourceManager;
import org.apache.streampipes.serializers.json.JacksonSerializer;
-import org.apache.streampipes.user.management.jwt.JwtTokenProvider;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
import java.io.IOException;
@@ -58,7 +53,7 @@ public class HttpRequestBuilder {
String jsonDocument = toJson();
Response httpResp =
Request.Post(endpointUrl)
- .addHeader("Authorization", getAuthToken())
+ .addHeader("Authorization", AuthTokenUtils.getAuthToken(this.pipelineId))
.bodyString(jsonDocument, ContentType.APPLICATION_JSON)
.connectTimeout(10000)
.execute();
@@ -72,7 +67,7 @@ public class HttpRequestBuilder {
public PipelineElementStatus detach() {
try {
Response httpResp = Request.Delete(endpointUrl)
- .addHeader("Authorization", getAuthToken())
+ .addHeader("Authorization", AuthTokenUtils.getAuthToken(this.pipelineId))
.connectTimeout(10000).execute();
return handleResponse(httpResp);
} catch (Exception e) {
@@ -97,24 +92,5 @@ public class HttpRequestBuilder {
return new PipelineElementStatus(endpointUrl, payload.getName(), response.isSuccess(), response.getOptionalMessage());
}
- private String getAuthToken() {
- if (SecurityContextHolder.getContext().getAuthentication() != null) {
- Authentication auth = SecurityContextHolder.getContext().getAuthentication();
- return "Bearer " + new JwtTokenProvider().createToken(auth);
- } else {
- if (this.pipelineId != null) {
- String ownerSid = new SpResourceManager()
- .managePermissions()
- .findForObjectId(this.pipelineId)
- .stream()
- .findFirst()
- .map(Permission::getOwnerSid).orElseThrow(() -> new IllegalArgumentException("Could not find owner for pipeline " + pipelineId));
- Principal correspondingUser = new SpResourceManager().manageUsers().getPrincipalById(ownerSid);
- return "Bearer " + new JwtTokenProvider().createToken(correspondingUser);
- } else {
- throw new IllegalArgumentException("No authenticated user found to associate with invocation request");
- }
- }
- }
}
diff --git a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/monitoring/pipeline/ExtensionsServiceLogExecutor.java b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/monitoring/pipeline/ExtensionsServiceLogExecutor.java
index 003de7c4d..0b77ea00e 100644
--- a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/monitoring/pipeline/ExtensionsServiceLogExecutor.java
+++ b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/monitoring/pipeline/ExtensionsServiceLogExecutor.java
@@ -20,7 +20,10 @@ package org.apache.streampipes.manager.monitoring.pipeline;
import com.fasterxml.jackson.core.JsonProcessingException;
import org.apache.http.client.fluent.Request;
+import org.apache.streampipes.manager.util.AuthTokenUtils;
+import org.apache.streampipes.model.client.user.Principal;
import org.apache.streampipes.model.monitoring.SpEndpointMonitoringInfo;
+import org.apache.streampipes.resource.management.SpResourceManager;
import org.apache.streampipes.serializers.json.JacksonSerializer;
import org.apache.streampipes.svcdiscovery.SpServiceDiscovery;
import org.apache.streampipes.svcdiscovery.api.model.DefaultSpServiceGroups;
@@ -42,7 +45,7 @@ public class ExtensionsServiceLogExecutor implements Runnable {
serviceEndpoints.forEach(serviceEndpoint -> {
try {
- String response = Request.Get(makeLogUrl(serviceEndpoint)).execute().returnContent().asString();
+ String response = makeRequest(serviceEndpoint).execute().returnContent().asString();
SpEndpointMonitoringInfo monitoringInfo = parseLogResponse(response);
ExtensionsLogProvider.INSTANCE.addMonitoringInfos(monitoringInfo);
} catch (IOException e) {
@@ -51,6 +54,15 @@ public class ExtensionsServiceLogExecutor implements Runnable {
});
}
+ private Request makeRequest(String serviceEndpointUrl) {
+ return Request.Get(makeLogUrl(serviceEndpointUrl))
+ .addHeader("Authorization", AuthTokenUtils.getAuthTokenForUser(getServiceAdmin()));
+ }
+
+ private Principal getServiceAdmin() {
+ return new SpResourceManager().manageUsers().getServiceAdmin();
+ }
+
private List<String> getActiveExtensionsEndpoints() {
return SpServiceDiscovery.getServiceDiscovery().getServiceEndpoints(
DefaultSpServiceGroups.EXT,
diff --git a/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/util/AuthTokenUtils.java b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/util/AuthTokenUtils.java
new file mode 100644
index 000000000..d50394ac5
--- /dev/null
+++ b/streampipes-pipeline-management/src/main/java/org/apache/streampipes/manager/util/AuthTokenUtils.java
@@ -0,0 +1,65 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.streampipes.manager.util;
+
+import org.apache.streampipes.model.client.user.Permission;
+import org.apache.streampipes.model.client.user.Principal;
+import org.apache.streampipes.resource.management.SpResourceManager;
+import org.apache.streampipes.user.management.jwt.JwtTokenProvider;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+
+public class AuthTokenUtils {
+
+ public static String getAuthToken(String resourceId) {
+ if (SecurityContextHolder.getContext().getAuthentication() != null) {
+ Authentication auth = SecurityContextHolder.getContext().getAuthentication();
+ return makeBearerToken(new JwtTokenProvider().createToken(auth));
+ } else {
+ if (resourceId != null) {
+ String ownerSid = getOwnerSid(resourceId);
+ return getAuthTokenForUser(ownerSid);
+ } else {
+ throw new IllegalArgumentException("No authenticated user found to associate with request");
+ }
+ }
+ }
+
+ public static String getAuthTokenForUser(String ownerSid) {
+ Principal correspondingUser = new SpResourceManager().manageUsers().getPrincipalById(ownerSid);
+ return getAuthTokenForUser(correspondingUser);
+ }
+
+ public static String getAuthTokenForUser(Principal principal) {
+ return makeBearerToken(new JwtTokenProvider().createToken(principal));
+ }
+
+ private static String makeBearerToken(String token) {
+ return "Bearer " + token;
+ }
+
+ private static String getOwnerSid(String resourceId) {
+ return new SpResourceManager()
+ .managePermissions()
+ .findForObjectId(resourceId)
+ .stream()
+ .findFirst()
+ .map(Permission::getOwnerSid).orElseThrow(() -> new IllegalArgumentException("Could not find owner for resource " + resourceId));
+ }
+}
diff --git a/streampipes-resource-management/src/main/java/org/apache/streampipes/resource/management/UserResourceManager.java b/streampipes-resource-management/src/main/java/org/apache/streampipes/resource/management/UserResourceManager.java
index ec6973ba7..a0d37b05e 100644
--- a/streampipes-resource-management/src/main/java/org/apache/streampipes/resource/management/UserResourceManager.java
+++ b/streampipes-resource-management/src/main/java/org/apache/streampipes/resource/management/UserResourceManager.java
@@ -18,6 +18,8 @@
package org.apache.streampipes.resource.management;
+import org.apache.streampipes.commons.constants.DefaultEnvValues;
+import org.apache.streampipes.commons.constants.Envs;
import org.apache.streampipes.commons.exceptions.UserNotFoundException;
import org.apache.streampipes.commons.exceptions.UsernameAlreadyTakenException;
import org.apache.streampipes.mail.MailSender;
@@ -57,6 +59,12 @@ public class UserResourceManager extends AbstractResourceManager<IUserStorage> {
return db.getUserById(principalId);
}
+ public Principal getServiceAdmin() {
+ return db.getServiceAccount(
+ Envs.SP_INITIAL_SERVICE_USER.getValueOrDefault(DefaultEnvValues.INITIAL_CLIENT_USER_DEFAULT)
+ );
+ }
+
public boolean registerUser(RegistrationData data) throws UsernameAlreadyTakenException {
try {
diff --git a/streampipes-user-management/src/main/java/org/apache/streampipes/user/management/jwt/JwtTokenProvider.java b/streampipes-user-management/src/main/java/org/apache/streampipes/user/management/jwt/JwtTokenProvider.java
index 779129a46..eb731e2c3 100644
--- a/streampipes-user-management/src/main/java/org/apache/streampipes/user/management/jwt/JwtTokenProvider.java
+++ b/streampipes-user-management/src/main/java/org/apache/streampipes/user/management/jwt/JwtTokenProvider.java
@@ -23,7 +23,6 @@ import org.apache.streampipes.config.backend.BackendConfig;
import org.apache.streampipes.config.backend.model.JwtSigningMode;
import org.apache.streampipes.config.backend.model.LocalAuthConfig;
import org.apache.streampipes.model.client.user.Principal;
-import org.apache.streampipes.model.client.user.UserAccount;
import org.apache.streampipes.security.jwt.JwtTokenGenerator;
import org.apache.streampipes.security.jwt.JwtTokenUtils;
import org.apache.streampipes.security.jwt.JwtTokenValidator;
@@ -95,7 +94,7 @@ public class JwtTokenProvider {
private Map<String, Object> makeClaims(Principal principal,
Set<String> roles) {
Map<String, Object> claims = new HashMap<>();
- claims.put(CLAIM_USER, UserInfoUtil.toUserInfo((UserAccount) principal, roles));
+ claims.put(CLAIM_USER, UserInfoUtil.toUserInfoObj(principal, roles));
return claims;
}
diff --git a/streampipes-user-management/src/main/java/org/apache/streampipes/user/management/util/UserInfoUtil.java b/streampipes-user-management/src/main/java/org/apache/streampipes/user/management/util/UserInfoUtil.java
index 2b4cd7d94..f50b414cb 100644
--- a/streampipes-user-management/src/main/java/org/apache/streampipes/user/management/util/UserInfoUtil.java
+++ b/streampipes-user-management/src/main/java/org/apache/streampipes/user/management/util/UserInfoUtil.java
@@ -18,20 +18,40 @@
package org.apache.streampipes.user.management.util;
-import org.apache.streampipes.model.client.user.UserAccount;
import org.apache.streampipes.model.UserInfo;
+import org.apache.streampipes.model.client.user.Principal;
+import org.apache.streampipes.model.client.user.ServiceAccount;
+import org.apache.streampipes.model.client.user.UserAccount;
import java.util.Set;
public class UserInfoUtil {
- public static UserInfo toUserInfo(UserAccount userAccount,
+ public static UserInfo toUserInfoObj(Principal principal,
+ Set<String> roles) {
+ return principal instanceof UserAccount ? toUserInfo((UserAccount) principal, roles) :
+ toServiceUserInfo((ServiceAccount) principal, roles);
+ }
+
+ private static UserInfo toUserInfo(UserAccount userAccount,
Set<String> roles) {
- UserInfo userInfo = new UserInfo();
- userInfo.setUsername(userAccount.getUsername());
- userInfo.setDisplayName(userAccount.getUsername());
+ UserInfo userInfo = prepareUserInfo(userAccount, roles);
userInfo.setShowTutorial(!userAccount.isHideTutorial());
+ return userInfo;
+ }
+
+ private static UserInfo toServiceUserInfo(ServiceAccount serviceAccount,
+ Set<String> roles) {
+ return prepareUserInfo(serviceAccount, roles);
+ }
+
+ private static UserInfo prepareUserInfo(Principal principal,
+ Set<String> roles) {
+ UserInfo userInfo = new UserInfo();
+ userInfo.setUsername(principal.getUsername());
+ userInfo.setDisplayName(principal.getUsername());
userInfo.setRoles(roles);
+
return userInfo;
}
}