Skip to content

WebSocket proxy should not make a consumer/producer when authorization is failed #448

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merlimat merged 2 commits into from
Jun 12, 2017
+26 −20
Merged

WebSocket proxy should not make a consumer/producer when authorization is failed #448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bbebf82
Made websocket proxy not make a consumer/producer when authorization …
Jun 5, 2017
47766cd
Made isAuthorized() in WebSocketHandler syncronized
Jun 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 17 additions & 10 deletions pulsar-websocket/src/main/java/com/yahoo/pulsar/websocket/AbstractWebSocketHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,28 +63,33 @@ public void onWebSocketConnect(Session session) {
if (service.isAuthenticationEnabled()) {
try {
authRole = service.getAuthenticationService().authenticateHttpRequest(request);
log.info("[{}] Authenticated WebSocket producer {} on topic {}", session.getRemoteAddress(), authRole,
log.info("[{}] Authenticated WebSocket client {} on topic {}", session.getRemoteAddress(), authRole,
topic);

} catch (AuthenticationException e) {
log.warn("[{}] Failed to authenticated WebSocket producer {} on topic {}: {}",
log.warn("[{}] Failed to authenticated WebSocket client {} on topic {}: {}",
session.getRemoteAddress(), authRole, topic, e.getMessage());
close(WebSocketError.AuthenticationError);
return;
}
}

if (service.isAuthorizationEnabled()) {
final String role = authRole;
isAuthorized(authRole).thenApply(isAuthorized -> {
if(!isAuthorized) {
log.warn("[{}] WebSocket Client [{}] is not authorized on topic {}", session.getRemoteAddress(), role,
try {
if (!isAuthorized(authRole)) {
log.warn("[{}] WebSocket Client [{}] is not authorized on topic {}", session.getRemoteAddress(), authRole,
topic);
close(WebSocketError.NotAuthorizedError);
return;
}
return null;
});
} catch (Exception e) {
log.warn("[{}] Got an exception when authorizing WebSocket client {} on topic {} on: {}",
session.getRemoteAddress(), authRole, topic, e.getMessage());
close(WebSocketError.UnknownError);
return;
}
}
createClient(session);
}

@Override
Expand Down Expand Up @@ -125,8 +130,6 @@ protected String checkAuthentication() {
return null;
}

protected abstract CompletableFuture<Boolean> isAuthorized(String authRole);

private String extractTopicName(HttpServletRequest request) {
String uri = request.getRequestURI();
List<String> parts = Splitter.on("/").splitToList(uri);
Expand All @@ -143,5 +146,9 @@ private String extractTopicName(HttpServletRequest request) {
return dn.toString();
}

protected abstract Boolean isAuthorized(String authRole) throws Exception;

protected abstract void createClient(Session session);

private static final Logger log = LoggerFactory.getLogger(AbstractWebSocketHandler.class);
}
8 changes: 3 additions & 5 deletions pulsar-websocket/src/main/java/com/yahoo/pulsar/websocket/ConsumerHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,7 @@ public ConsumerHandler(WebSocketService service, HttpServletRequest request) {
}

@Override
public void onWebSocketConnect(Session session) {
super.onWebSocketConnect(session);

protected void createClient(Session session) {
try {
this.consumer = service.getPulsarClient().subscribe(topic, subscription, conf);
this.service.addConsumer(this);
Expand Down Expand Up @@ -247,8 +245,8 @@ private ConsumerConfiguration getConsumerConfiguration() {
}

@Override
protected CompletableFuture<Boolean> isAuthorized(String authRole) {
return service.getAuthorizationManager().canConsumeAsync(DestinationName.get(topic), authRole);
protected Boolean isAuthorized(String authRole) throws Exception {
return service.getAuthorizationManager().canConsume(DestinationName.get(topic), authRole);
}

private static String extractSubscription(HttpServletRequest request) {
Expand Down
11 changes: 6 additions & 5 deletions pulsar-websocket/src/main/java/com/yahoo/pulsar/websocket/ProducerHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,14 +88,14 @@ public void close() throws IOException {
}

@Override
public void onWebSocketConnect(Session session) {
super.onWebSocketConnect(session);

protected void createClient(Session session) {
try {
ProducerConfiguration conf = getProducerConfiguration();
this.producer = service.getPulsarClient().createProducer(topic, conf);
this.service.addProducer(this);
} catch (Exception e) {
log.warn("[{}] Failed in creating producer on topic {}", session.getRemoteAddress(),
topic, e);
close(FailedToCreateProducer, e.getMessage());
}
}
Expand Down Expand Up @@ -176,8 +176,9 @@ public long getMsgPublishedCounter() {
return MSG_PUBLISHED_COUNTER_UPDATER.get(this);
}

protected CompletableFuture<Boolean> isAuthorized(String authRole) {
return service.getAuthorizationManager().canProduceAsync(DestinationName.get(topic), authRole);
@Override
protected Boolean isAuthorized(String authRole) throws Exception {
return service.getAuthorizationManager().canProduce(DestinationName.get(topic), authRole);
}

private void sendAckResponse(ProducerAck response) {
Expand Down