conjur-asset-ui-api 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4e58d15d8bff87b2a55387b4ceedf751fa4196f
-  data.tar.gz: 72c9f5cc63f114979e19b0b6a4d3034b71999450
+  metadata.gz: 7411cf0ff97005386a475d49c0fc2dfc015504c0
+  data.tar.gz: f0f45c605c547afa2d6216472d0c04967b3318c0
 SHA512:
-  metadata.gz: d361ca37db90dda03a4a74c55447f4e41778d305466a4d28022de0c1aa546b4a87066cec7f460761a81acb88bae70401a14dbd4d7c72ad665154fe9bc6536012
-  data.tar.gz: 0c8c2dc7a6fcdb2a59a9b8189ae4421c6e2af6ed51440a3d92e0a042efa4a9c8c54e8adb84afe84cdd6c952e4ac87a0a6c3269536a6efebd86f993d8bcbef499
+  metadata.gz: 56229687c796bffce448229fd4711c99bb78193b1cf2751c99d50d43a98e0bb0a4fa1fe0c5518d0709ce2e77ebfddf7d1e7368fbc5531da5ac3126c64cc0ce9e
+  data.tar.gz: 397fb524b5499af16448d2f3496a469054aa18ca77d64b1bfb1562329bbf44960a410f6968d893e1438f8977c4c2bd9977c09b3bdd843217af60a2939ede437a

data/Rakefile

@@ -1 +1,3 @@
 require "bundler/gem_tasks"
+require 'jasmine'
+load 'jasmine/tasks/jasmine.rake'

data/compile_ls

@@ -1,2 +1,6 @@
 #!/bin/bash
-lsc -w -c -o public/js livescript
+lsc -w -c -o public/js livescript &
+lsc -w -c -o spec spec &
+while sleep 42; do true; done
+kill `jobs -p`
+

data/conjur-asset-ui.gemspec

@@ -33,4 +33,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "spork"
   spec.add_development_dependency "ci_reporter"
+  spec.add_development_dependency "jasmine"
 end

data/lib/conjur-asset-ui-version.rb

@@ -1,7 +1,7 @@
 module Conjur
   module Asset
     module UI
-      VERSION="1.1.1"
+      VERSION="1.2.0"
     end
   end
 end

data/lib/conjur/webserver/home.rb

@@ -2,35 +2,41 @@ require 'time'
 require 'rack/utils'
 require 'rack/mime'
 
+require 'conjur/webserver/renderer'
+
 module Conjur
   module WebServer
     class Home
-      F = ::File
-      
       def initialize(root)
         @root = root
       end
-      
+
       # From Rack::File
       def call(env)
-        path = File.expand_path("index.html", @root)
+        path = File.expand_path(INDEX, @root)
+        renderer = Renderer.new @root
+
+        page = renderer.render File.read(path)
+        files = renderer.files + [path]
+
+        last_modified = files.map(&File.method(:mtime)).max.httpdate
 
-        if env["REQUEST_METHOD"] == "OPTIONS"
-                return [200, {'Allow' => ALLOW_HEADER, 'Content-Length' => '0'}, []]
-        end
-        last_modified = F.mtime(path).httpdate
         return [304, {}, []] if env['HTTP_IF_MODIFIED_SINCE'] == last_modified
 
-        size = F.size?(path) || Rack::Utils.bytesize(F.read(path))
-  
-        headers = { 
+        size = Rack::Utils.bytesize(page)
+
+        headers = {
           "Last-Modified"  => last_modified,
           "Content-Type"   => "text/html",
           "Content-Length" => size.to_s
         }
-  
-        [ 200, headers, env["REQUEST_METHOD"] == "HEAD" ? [] : [ F.read(path) ] ]
+
+        [200, headers, env["REQUEST_METHOD"] == "HEAD" ? [] : [page]]
       end
+
+      private
+
+      INDEX = 'index.html.erb'.freeze
     end
   end
 end

data/lib/conjur/webserver/login.rb

@@ -10,6 +10,12 @@ module Conjur
       
       def call(env)
         if sessionid = token_valid?(env)
+          require 'conjur/authn'
+          require 'base64'
+          token = Conjur::Authn.authenticate
+          api = Conjur::API.new_from_token token
+          userid = [ Conjur.configuration.account, "user", api.username ].join(':')
+
           env["rack.session"][:sessionid] = sessionid
           response = Rack::Response.new(env)
           configuration = {
@@ -20,6 +26,7 @@ module Conjur
           }
           response.status = 302
           response.set_cookie('conjur_configuration', value: JSON.pretty_generate(configuration), path: '/')
+          response.set_cookie('conjur_userid', value: userid, path: '/')
           response['Location'] = "/ui"
           response.finish
         else

data/lib/conjur/webserver/renderer.rb

@@ -0,0 +1,34 @@
+module Conjur
+  module WebServer
+    # a helper class to render HTML partials
+    class Renderer
+      def initialize root
+        @root = root
+        @files = []
+      end
+
+      attr_reader :files
+
+      def render template
+        ERB.new(template).result binding
+      end
+
+      private
+
+      def method_missing name, *a, &b
+        super if !a.empty? || block_given?
+
+        # try to load fragments
+        path = expand_path "_#{name}.html"
+        super unless File.exists? path
+
+        @files << path
+        File.read path
+      end
+
+      def expand_path filename
+        File.expand_path(filename, @root)
+      end
+    end
+  end
+end

data/livescript/views/audit.ls

@@ -1,20 +1,31 @@
 {table, div, th, tr, td, thead, tbody, section, h3, time} = React.DOM
 {map, each, unique, is-type, join} = require 'prelude-ls'
 
-fields = <[ timestamp user acting_as action kind entity privilege ]>
+compact_fields = <[ user action entities ]>
+extended_fields = <[ timestamp user acting_as action entities privilege ]>
 
+FieldsMixin = {
+  fields: ->
+    if @props.compact
+      compact_fields
+    else
+      extended_fields
+}
 
 AuditTableHeader = React.createClass {
+  mixins: [ FieldsMixin ]
+
   display-name: \AuditTableHeader
+  
   render: ->
-    thead {}, (tr {}, (fields |> map -> th key: it, it.replace \_, ' '))
+    thead {}, (tr {}, (@fields() |> map -> th key: it, it.replace \_, ' '))
 }
 
 Timestamp = React.createClass {
   display-name: \Timestamp
   render: ->
     ts = moment(@props.time)
-    time datetime: ts.format!, title: ts.calendar!, [ ts.from-now! ]
+    time date-time: ts.format!, title: ts.calendar!, [ ts.from-now! ]
 }
 
 wrap-array = ->
@@ -23,24 +34,24 @@ wrap-array = ->
   else
     [it]
 
-AuditEntry = React.createClass {
-  display-name: \AuditEntry
+export AuditEntry = React.createClass {
+  mixins: [ FieldsMixin ]
 
-  transformed-props: ->
-    @props with
-      entity: @props.resource || @props.role
+  display-name: \AuditEntry
 
   transform-field: (key, value) ->
-    | not value => value # need this case to handle blank values that turn up sometimes
-    | key in <[ user acting_as ]> => RoleLink {id: value}
-    | key == 'entity' => ResourceLink {data: value}
-    | key == 'timestamp' => Timestamp {time: value}
-    | otherwise => value
+    switch key
+    | \entities => [
+      if @props.resource? then ResourceLink data: that
+      if @props.role? then RoleLink id: that
+    ]
+    | <[ user acting_as ]> => RoleLink {id: value} if value?
+    | \timestamp => Timestamp {time: value} if value?
+    | _ => value
 
   render: ->
-    props = @transformed-props!
     tr class-name: @props.action,
-      fields |> map ~> td key: it, [ @transform-field(it, props[it]) ]
+      @fields() |> map ~> td key: it, ...wrap-array(@transform-field(it, @props[it]))
 }
 
 # compare events by id to prevent duplicates
@@ -52,19 +63,20 @@ new-event-set = ->
     @priv.comparator(existing, item) == 0 if existing?
   evts
 
-AuditTable = React.createClass {
+export AuditTable = React.createClass {
   display-name: \AuditTable
 
   get-initial-state: ->
     events: new-event-set!
 
   render: ->
+    compact = @props.compact
     section class-name: \audit, [
       h3 {}, @props.caption
       table class-name: \audit-table, [
-        AuditTableHeader(key: \thead),
+        AuditTableHeader(key: \thead, compact: compact),
         tbody key: \tbody,
-            @state.events.map -> new AuditEntry it with key: it.id
+            @state.events.map -> new AuditEntry it with key: it.id, compact: compact
       ]
     ]
 
@@ -119,6 +131,6 @@ export AuditBox = React.createClass {
     things = (roles ++ resources) |> unique |> join ', '
     AuditTable {
       src: role-srcs ++ res-srcs
-      caption: "Recent audit events for #things"
+      caption: "Recent Activity"
     }
 }

data/public/_client_code.html

@@ -0,0 +1,37 @@
+    <script src="/js/models/namespace.js"></script>
+    <script src="/js/models/resourceList.js"></script>
+    <script src="/js/models/policyList.js"></script>
+    <script src="/js/models/userList.js"></script>
+    <script src="/js/models/variableList.js"></script>
+    <script src="/js/models/record.js"></script>
+    <script src="/js/models/groupRecord.js"></script>
+    <script src="/js/models/layerRecord.js"></script>
+    <script src="/js/models/variableRecord.js"></script>
+    <script src="/js/models/hostRecord.js"></script>
+    <script src="/js/models/userRecord.js"></script>
+    <script type="text/jsx" src="/js/views/mixins/search.js"></script>
+    <script type="text/jsx" src="/js/views/owned.js"></script>
+    <script type="text/jsx" src="/js/views/audit.js"></script>
+    <script type="text/jsx" src="/js/views/dashboard.js"></script>
+    <script type="text/jsx" src="/js/views/generic.js"></script>
+    <script type="text/jsx" src="/js/views/namespaces.js"></script>
+    <script type="text/jsx" src="/js/views/users.js"></script>
+    <script type="text/jsx" src="/js/views/hosts.js"></script>
+    <script type="text/jsx" src="/js/views/host.js"></script>
+    <script type="text/jsx" src="/js/views/role.js"></script>
+    <script type="text/jsx" src="/js/views/group.js"></script>
+    <script type="text/jsx" src="/js/views/groups.js"></script>
+    <script type="text/jsx" src="/js/views/layer.js"></script>
+    <script type="text/jsx" src="/js/views/layers.js"></script>
+    <script type="text/jsx" src="/js/views/variable.js"></script>
+    <script type="text/jsx" src="/js/views/variables.js"></script>
+    <script type="text/jsx" src="/js/views/policies.js"></script>
+    <script type="text/jsx" src="/js/views/policy.js"></script>
+    <script type="text/jsx" src="/js/views/resource.js"></script>
+    <script type="text/jsx" src="/js/views/permissions.js"></script>
+    <script type="text/jsx" src="/js/views/user.js"></script>
+    <script type="text/jsx" src="/js/views/time.js"></script>
+    <script type="text/jsx" src="/js/views/navSearch.js"></script>
+    <script type="text/jsx" src="/js/views/searchResults.js"></script>
+    <script src="/js/views/audit.js"></script>
+    <script type="text/jsx" src="/js/main.js"></script>

data/public/_client_libs.html

@@ -0,0 +1,21 @@
+    <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
+    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+    <!--[if lt IE 9]>
+      <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
+      <script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
+    <![endif]-->
+
+    <script src="/js/lib/sorted-set.no-require.js"></script>
+    <script src="/js/lib/less.js"></script>
+    <script src="/js/lib/react-with-addons.js"></script>
+    <script src="/js/lib/JSXTransformer.js"></script>
+    <script src="http://cdnjs.cloudflare.com/ajax/libs/showdown/0.3.1/showdown.min.js"></script>
+    <script src="http://code.jquery.com/jquery-1.10.0.min.js"></script>
+    <script src="/js/lib/async.js"></script>
+    <script src="/js/lib/underscore-min.js"></script>
+    <script src="/js/lib/underscore.string.min.js"></script>
+    <script src="/js/lib/backbone.js"></script>
+    <script src="/js/lib/bootstrap.js"></script>
+    <script src="/js/lib/date.extensions.js"></script>
+    <script src="/js/lib/moment.js"></script>
+    <script src="/js/lib/prelude-browser-min.js"></script>

data/public/css/styles.less

@@ -154,17 +154,17 @@ dl.propertyList {
   .role-link-icon('/images/icon-environment.png', 1.1em);
 }
 
-.host.role-link {
+.host.role-link, .host.resource-link {
   .role-link-icon('/images/icon-client-pc.svg');
   background-position-y: -0.1em;
 }
 
-.user.role-link {
+.user.role-link, .user.resource-link {
   .role-link-icon('/images/icon-person.svg');
   background-position-y: -0.2em;
 }
 
-.group.role-link {
+.group.role-link, .group.resource-link {
   .role-link-padding;
   .group-icon(1.2em);
 }
@@ -179,6 +179,25 @@ dl.propertyList {
   margin-left: 0.5em;
 }
 
+
+.dashboard {
+  #dashboard-search {
+    margin: 4em auto;
+  }
+  
+  .owned ul {
+    margin: 0;
+    padding: 0;
+  }
+
+  .owned .hide-all { display: none; }
+  
+  .owned li {
+    list-style-type: none;
+    padding: 3pt 8pt;
+  }
+}
+
 .dashboard form.search, #searchResults form.search {
   margin: 0px auto;
   width: 300px;
@@ -270,7 +289,7 @@ body {
   }
 
   h3 {
-    margin: 2em 0 1em;
+    margin: 1em 0 1em;
     letter-spacing: 0.01em;
     font-weight: 300;
   }
@@ -296,12 +315,6 @@ body {
 //
 // Styleguide 1.1.
 section.permissions {
-  &.loading {
-    h3:after {
-      content: ' — loading, please wait…';
-      font-weight: 300;
-    }
-  }
 }
 
 // The topmost content container.

data/public/index.html.erb

@@ -0,0 +1,71 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>Conjur UI</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <link href='http://fonts.googleapis.com/css?family=Lato:300,400,700,300italic,400italic,700italic' rel='stylesheet' type='text/css'>
+
+    <script src="/js/lib/pace.js"></script>
+    <!-- Bootstrap -->
+    <link href="/css/bootstrap.css" rel="stylesheet">
+
+    <!-- Some styles of our own -->
+    <link href="/css/styles.less" rel="stylesheet/less">
+
+    <%= client_libs %>
+  </head>
+  <body>
+    <div class="container">
+      <div class="navbar navbar-default" role="navigation">
+        <div class="navbar-collapse collapse">
+          <ul class="nav navbar-nav">
+            <li id="nav-home" class="nav-item"><a href="/ui">Dashboard</a></li>
+            <li id="nav-groups" class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+                Actors <span class="caret"></span>
+              </a>
+              <ul class="dropdown-menu">
+                <li id="nav-users" class="nav-item"><a href="/ui/users">Users</a></li>
+                <li id="nav-groups" class="nav-item"><a href="/ui/groups">Groups</a></li>
+                <li class="divider"></li>
+                <li id="nav-hosts" class="nav-item"><a href="/ui/hosts">Hosts</a></li>
+                <li id="nav-layers" class="nav-item"><a href="/ui/layers">Layers</a></li>
+              </ul>
+            </li>
+            <li id="nav-assets" class="dropdown">
+              <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+                Assets <span class="caret"></span>
+              </a>
+              <ul class="dropdown-menu">
+                <li id="nav-hosts" class="nav-item"><a href="/ui/hosts">Hosts</a></li>
+                <li id="nav-variables" class="nav-item"><a href="/ui/variables">Variables</a></li>
+                <li id="nav-key-pairs" class="nav-item"><a href="/ui/key-pairs">Key Pairs</a></li>
+                <li id="nav-web-services" class="nav-item"><a href="/ui/webservices">Web Services</a></li>
+              </ul>
+            </li>
+            <li id="nav-policies" class="nav-item"><a href="/ui/policies">Policies</a></li>
+            <li id="nav-audit" class="nav-item"><a href="/ui/audit">Audit</a></li>
+          </ul>
+          <div class="navbar-right" id="inlineSearchContainer">
+          </div>
+        </div>
+      </div>
+
+      </div>
+        <div class="alert alert-danger alert-dismissable" id="flash">
+            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+            <span class="text"></span>
+        </div>
+      <div id="content"></div>
+      <div id="bottom"></div>
+    </div><!-- /.container -->
+
+
+    <div id="modal">
+        
+    </div>
+
+
+    <%= client_code %>
+  </body>
+</html>