You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by ja...@apache.org on 2018/11/15 00:56:35 UTC
[pulsar] branch jai1-patch-1 created (now 18ff028)
This is an automated email from the ASF dual-hosted git repository.
jai1 pushed a change to branch jai1-patch-1
in repository https://gitbox.apache.org/repos/asf/pulsar.git.
at 18ff028 Update PulsarWebResource.java
This branch includes the following new commits:
new 18ff028 Update PulsarWebResource.java
The 1 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.
[pulsar] 01/01: Update PulsarWebResource.java
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jai1 pushed a commit to branch jai1-patch-1
in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit 18ff0285d9025b31ea803bcd9be3f26acc4e00ae
Author: Jai Asher <ja...@ccs.neu.edu>
AuthorDate: Wed Nov 14 16:56:28 2018 -0800
Update PulsarWebResource.java
---
.../org/apache/pulsar/broker/web/PulsarWebResource.java | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/PulsarWebResource.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/PulsarWebResource.java
index 4b465b7..6e267c4 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/PulsarWebResource.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/web/PulsarWebResource.java
@@ -143,23 +143,19 @@ public abstract class PulsarWebResource {
public static boolean isClientAuthenticated(String appId) {
return appId != null;
}
-
+
private static void validateOriginalPrincipal(Set<String> proxyRoles, String authenticatedPrincipal,
String originalPrincipal) {
- if (originalPrincipal != null) {
+ if (proxyRoles.contains(authenticatedPrincipal)) {
+ // Request has come from a proxy
if (StringUtils.isBlank(originalPrincipal)) {
log.warn("Original principal empty in request authenticated as {}", authenticatedPrincipal);
- throw new RestException(Status.UNAUTHORIZED, "Original principal cannot be empty if it is set");
+ throw new RestException(Status.UNAUTHORIZED, "Original principal cannot be empty if the request is via proxy.");
}
if (proxyRoles.contains(originalPrincipal)) {
log.warn("Original principal {} cannot be a proxy role ({})", originalPrincipal, proxyRoles);
- throw new RestException(Status.UNAUTHORIZED, "Original principal cannot be a proxy role");
- }
- if (!proxyRoles.contains(authenticatedPrincipal)) {
- log.warn("Original principal can only be accepted from a client authenticated as a proxy. "
- + "{} is not part of proxyRoles", authenticatedPrincipal, proxyRoles);
- throw new RestException(Status.UNAUTHORIZED, "Original principal only accepted from proxy");
- }
+ throw new RestException(Status.UNAUTHORIZED, "Original principal cannot be a proxy role");
+ }
}
}