Sp/anonymous user tests (#128)

[Issue-127] fix anonymous user access to streams

Author: Crim

CHANGELOG.md

@@ -2,6 +2,12 @@
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 2.1.3 (UNRELEASED)
+
+#### Bug fixes
+- [ISSUE-127](https://github.com/SourceLabOrg/kafka-webview/issues/127) Anonymous users were unable to stream views.
+
+
 ## 2.1.2 (01/15/2018)
 
 #### Bug fixes

dev-cluster/pom.xml

@@ -5,12 +5,12 @@
     <parent>
         <artifactId>kafka-webview</artifactId>
         <groupId>org.sourcelab</groupId>
-        <version>2.1.2</version>
+        <version>2.1.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>dev-cluster</artifactId>
-    <version>2.1.2</version>
+    <version>2.1.3</version>
 
     <!-- Require Maven 3.3.9 -->
     <prerequisites>

kafka-webview-plugin/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.sourcelab</groupId>
         <artifactId>kafka-webview</artifactId>
-        <version>2.1.2</version>
+        <version>2.1.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>kafka-webview-plugin</artifactId>

kafka-webview-ui/pom.xml

@@ -5,11 +5,11 @@
     <parent>
         <artifactId>kafka-webview</artifactId>
         <groupId>org.sourcelab</groupId>
-        <version>2.1.2</version>
+        <version>2.1.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>kafka-webview-ui</artifactId>
-    <version>2.1.2</version>
+    <version>2.1.3</version>
 
     <!-- Module Description and Ownership -->
     <name>Kafka WebView UI</name>

kafka-webview-ui/src/main/java/org/sourcelab/kafka/webview/ui/controller/stream/StreamController.java

@@ -24,6 +24,7 @@
 
 package org.sourcelab.kafka.webview.ui.controller.stream;
 
+import org.sourcelab.kafka.webview.ui.configuration.AppProperties;
 import org.sourcelab.kafka.webview.ui.controller.BaseController;
 import org.sourcelab.kafka.webview.ui.controller.api.requests.ConsumeRequest;
 import org.sourcelab.kafka.webview.ui.manager.kafka.SessionIdentifier;
@@ -33,6 +34,7 @@
 import org.sourcelab.kafka.webview.ui.manager.socket.WebSocketConsumersManager;
 import org.sourcelab.kafka.webview.ui.manager.ui.BreadCrumbManager;
 import org.sourcelab.kafka.webview.ui.manager.ui.FlashMessage;
+import org.sourcelab.kafka.webview.ui.manager.user.AnonymousUserDetailsService;
 import org.sourcelab.kafka.webview.ui.manager.user.CustomUserDetails;
 import org.sourcelab.kafka.webview.ui.model.View;
 import org.sourcelab.kafka.webview.ui.repository.ViewRepository;
@@ -58,6 +60,9 @@
 @Controller
 @RequestMapping("/stream")
 public class StreamController extends BaseController {
+    @Autowired
+    private AppProperties appProperties;
+
     @Autowired
     private ViewRepository viewRepository;
 
@@ -186,6 +191,11 @@ private long getLoggedInUserId(final SimpMessageHeaderAccessor headerAccessor) {
      * @return Currently logged in user's details.
      */
     private CustomUserDetails getLoggedInUser(final SimpMessageHeaderAccessor headerAccessor) {
-        return (CustomUserDetails) ((Authentication)headerAccessor.getUser()).getPrincipal();
+        // If we're using anonymous access
+        if (!appProperties.isUserAuthEnabled()) {
+            // Return default 'anonymous' user.
+            return AnonymousUserDetailsService.getDefaultAnonymousUser();
+        }
+        return (CustomUserDetails) ((Authentication) headerAccessor.getUser()).getPrincipal();
     }
 }

kafka-webview-ui/src/main/resources/templates/layout.html

@@ -74,15 +74,23 @@
     <!-- User Settings Nav -->
     <ul class="nav navbar-nav ml-auto">
         <li class="nav-item dropdown" style="padding-right: 50px;">
-            <a class="nav-link dropdown-toggle nav-link" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
+            <a
+                class="nav-link nav-link"
+                th:classappend="${MenuShowUserConfig} ? dropdown-toggle : blank"
+                data-toggle="dropdown"
+                href="#"
+                role="button"
+                aria-haspopup="true"
+                aria-expanded="false">
+
                 <i class="icon-user"></i>
                 <span class="d-md-down-none" sec:authentication="name"></span>
             </a>
-            <div class="dropdown-menu dropdown-menu-right">
-                <div class="dropdown-header text-center" th:if="${MenuShowUserConfig}">
+            <div class="dropdown-menu dropdown-menu-right" th:if="${MenuShowUserConfig}">
+                <div class="dropdown-header text-center">
                     <strong>Settings</strong>
                 </div>
-                <a class="dropdown-item" th:href="@{/configuration/user/edit/{id}(id=${UserId})}" th:if="${MenuShowUserConfig}">
+                <a class="dropdown-item" th:href="@{/configuration/user/edit/{id}(id=${UserId})}">
                     <i class="fa fa-user"></i> Profile
                 </a>
                 <div class="divider"></div>

kafka-webview-ui/src/test/java/org/sourcelab/kafka/webview/ui/controller/login/AnonymousLoginTest.java

@@ -29,9 +29,21 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.messaging.converter.MappingJackson2MessageConverter;
+import org.springframework.messaging.simp.stomp.StompSession;
+import org.springframework.messaging.simp.stomp.StompSessionHandlerAdapter;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.MvcResult;
+import org.springframework.web.socket.client.standard.StandardWebSocketClient;
+import org.springframework.web.socket.messaging.WebSocketStompClient;
+import org.springframework.web.socket.sockjs.client.SockJsClient;
+import org.springframework.web.socket.sockjs.client.Transport;
+import org.springframework.web.socket.sockjs.client.WebSocketTransport;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
@@ -59,6 +71,5 @@ public void test_validAnonymousUser() throws Exception {
             .andExpect(status().isOk())
             .andReturn();
     }
-
 }