brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From henev...@apache.org
Subject [1/3] brooklyn-ui git commit: Request container authentication
Date Wed, 30 Mar 2016 14:02:39 GMT
Repository: brooklyn-ui
Updated Branches:
  refs/heads/master 9784f49ab -> cbddc7f8b


Request container authentication


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/14f9a0fd
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/14f9a0fd
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/14f9a0fd

Branch: refs/heads/master
Commit: 14f9a0fdacd02f8665de86bc2a90354b47959d92
Parents: 6e02739
Author: Svetoslav Neykov <svetoslav.neykov@cloudsoftcorp.com>
Authored: Sun Feb 28 16:13:15 2016 +0200
Committer: Svetoslav Neykov <svetoslav.neykov@cloudsoftcorp.com>
Committed: Sun Feb 28 16:13:15 2016 +0200

----------------------------------------------------------------------
 .gitignore                                      |  1 +
 src/main/webapp/WEB-INF/web.xml                 | 37 +++++++++++++++++---
 src/main/webapp/assets/css/base.css             |  4 +++
 .../webapp/assets/js/util/brooklyn-utils.js     |  2 +-
 src/main/webapp/index.html                      |  2 +-
 5 files changed, 40 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/14f9a0fd/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 8fb7ef7..d03b19c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,3 +31,4 @@ brooklyn*.log.*
 
 ignored
 /build/
+/target/

http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/14f9a0fd/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 02e7fcc..c89697a 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -1,6 +1,3 @@
-<!DOCTYPE web-app PUBLIC
- "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- "http://java.sun.com/dtd/web-app_2_3.dtd" >
 <!--
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
@@ -19,6 +16,38 @@
     specific language governing permissions and limitations
     under the License.
 -->
-<web-app>
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
+         version="3.1">
+
   <display-name>Brooklyn</display-name>
+
+  <security-constraint>
+    <web-resource-collection>
+      <web-resource-name>Logout</web-resource-name>
+      <url-pattern>/v1/logout</url-pattern>
+    </web-resource-collection>
+  </security-constraint>
+
+  <!-- Ignored programmatically if noConsoleSecurity -->
+  <security-constraint>
+    <web-resource-collection>
+      <web-resource-name>All</web-resource-name>
+      <url-pattern>/</url-pattern>
+    </web-resource-collection>
+    <auth-constraint>
+      <role-name>webconsole</role-name>
+    </auth-constraint>
+  </security-constraint>
+
+  <login-config>
+    <auth-method>BASIC</auth-method>
+    <realm-name>webconsole</realm-name>
+  </login-config>
+
+  <security-role>
+    <role-name>webconsole</role-name>
+  </security-role>
+
 </web-app>

http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/14f9a0fd/src/main/webapp/assets/css/base.css
----------------------------------------------------------------------
diff --git a/src/main/webapp/assets/css/base.css b/src/main/webapp/assets/css/base.css
index a80f35b..0d6eafa 100644
--- a/src/main/webapp/assets/css/base.css
+++ b/src/main/webapp/assets/css/base.css
@@ -503,6 +503,10 @@ input[type="color"]:focus,.uneditable-input:focus {
     white-space: nowrap;
 }
 
+.navbar_main error-message {
+    white-space: normal;
+}
+
 /* traditional tree-style (clickable + icons) tree-list */
 #tree-list {
 }

http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/14f9a0fd/src/main/webapp/assets/js/util/brooklyn-utils.js
----------------------------------------------------------------------
diff --git a/src/main/webapp/assets/js/util/brooklyn-utils.js b/src/main/webapp/assets/js/util/brooklyn-utils.js
index 5f3915c..5012363 100644
--- a/src/main/webapp/assets/js/util/brooklyn-utils.js
+++ b/src/main/webapp/assets/js/util/brooklyn-utils.js
@@ -178,7 +178,7 @@ define([
         $.ajax({
             type: "POST",
             dataType: "text",
-            url: "/logout",
+            url: "/v1/logout",
             success: function() {
                 window.location.replace("/");
             },

http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/14f9a0fd/src/main/webapp/index.html
----------------------------------------------------------------------
diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html
index b554599..b1c52f0 100644
--- a/src/main/webapp/index.html
+++ b/src/main/webapp/index.html
@@ -47,7 +47,7 @@
 
 <div class="navbar navbar-fixed-top">
     <div class="navbar-inner">
-        <div class="userName-top"><span id="user"></span> | <a href="/logout"
id="logout-link">Log out</a></div>
+        <div class="userName-top"><span id="user"></span> | <a href="/v1/logout"
id="logout-link">Log out</a></div>
         <div class="container">
             <a class="logo" href="#" title="Brooklyn, Version 0.9.0-SNAPSHOT"><!--
Logo added via CSS --></a> <!-- BROOKLYN_VERSION -->
             <div class="menubar-top">


Mime
View raw message