conjur-asset-ui 1.3.2 → 1.4.2

data/public/js/models/variableList.js

@@ -1,16 +1,27 @@
+/* global conjur */
+
 (function(conjur) {
     'use strict';
 
-    conjur.models.VariableList = function() {
+    this.VariableList = function() {
         var options = {
-            filter: function(member) {
-                var idTokens = member.id.split(':');
-                var id = idTokens[idTokens.length-1];
-                return id.split('/').length > 1;
+            namespaceSelector: function(member) {
+                var idTokens = member.id.split('@');
+
+                if (idTokens.length > 1) {
+                    return idTokens.slice(1, idTokens.length-1).join['@'];
+                } else {
+                    return null;
+                }
             }
         };
 
-        return conjur.models.ResourceList('variable', options);
+        var list = conjur.models.ResourceList('variable', options);
+
+        return list;
     };
 
-})(conjur);
+}).bind(conjur.models)
+(
+    conjur
+);

data/public/js/models/variableRecord.js

@@ -1,3 +1,5 @@
+/* global conjur, jQuery, async */
+
 (function(conjur, $, async, errback) {
     'use strict';
 
@@ -18,23 +20,22 @@
     Variable.prototype = Object.create(Generic.prototype);
     Variable.prototype.constructor = Variable;
 
-    Variable.prototype.fetch = function(callback, custom_errback) {
-        var self = this,
-            id = this.id;
+    Variable.prototype.fetch = function(callback, customErrback) {
+        var id = this.id;
 
-        if (typeof(custom_errback) === 'undefined') {
-            custom_errback = errback; // reset to default
+        if (typeof(customErrback) === 'undefined') {
+            customErrback = errback; // reset to default
         }
 
         function members(privilege) {
             return function(cb) {
                 $.ajax({
-                    url: '/api/authz/'
-                        + conjur.app.configuration.account
-                        + '/roles/allowed_to/'
-                        + privilege
-                        + '/variable/'
-                        + window.encodeURIComponent(id),
+                    url: '/api/authz/' +
+                        conjur.app.configuration.account +
+                        '/roles/allowed_to/' +
+                        privilege +
+                        '/variable/' +
+                        window.encodeURIComponent(id),
                     success: function(result) {
                         cb(null, result);
                     },
@@ -47,17 +48,20 @@
             this.attributes.bind(this),
             members('execute'),
             members('update'),
-            this.resource.bind(this)
+            this.resource.bind(this),
+            this.auditResource.bind(this)
         ], function(err, results) {
             if (err) {
-                return custom_errback(err.status);
+                return customErrback(err.status);
             }
 
             callback({
                 variable: results[0],
                 fetchers: results[1],
                 updaters: results[2],
-                annotations: results[3].annotations
+                owner: results[3].owner,
+                annotations: results[3].annotations,
+                audit: results[4]
             });
 
             return undefined;

data/public/js/routers.js

@@ -1,14 +1,23 @@
 /** @jsx React.DOM */
+/* global conjur, jQuery, _, Backbone, React */
 
-(function(conjur, $, _, Backbone, React, SearchResults) {
+
+(function(conjur, $, _, Backbone, React) {
     'use strict';
 
-    var GroupBox = conjur.views.GroupBox,
+    var Dashboard = conjur.views.Dashboard,
+        GroupBox = conjur.views.GroupBox,
         LayerBox = conjur.views.LayerBox,
         PolicyBox = conjur.views.PolicyBox,
         VariableBox = conjur.views.VariableBox,
-        HostBox = conjur.views.HostBox,
-        UserBox = conjur.views.UserBox;
+        UserBox = conjur.views.UserBox,
+        Group = conjur.views.Group,
+        Host = conjur.views.Host,
+        Layer = conjur.views.Layer,
+        Policy = conjur.views.Policy,
+        User = conjur.views.User,
+        Variable = conjur.views.Variable,
+        SearchResults = conjur.views.SearchResults;
 
     conjur.Workspace = Backbone.Router.extend({
         routes: {
@@ -37,7 +46,8 @@
 
             conjur.app.lists[conjur.app.kind].fetch(function(list) {
                 var component = componentFunction(list);
-                // doesn't make much sense due to http://stackoverflow.com/questions/24889934/componentinstance-setstate-undefined-in-0-11-0
+                // doesn't make much sense due to
+                // http://stackoverflow.com/questions/24889934/componentinstance-setstate-undefined-in-0-11-0
                 //components[kind] = component;
 
                 React.renderComponent(
@@ -45,15 +55,15 @@
                     document.getElementById('content')
                 );
 
-                // state reset won't work anymore in react v11, plus I am not sure how it is supposed to work, if namespace was just reset to zero
-                // component.setState({currentNamespace: namespace.currentNamespace, members: list.members(namespace.currentNamespace)});
+                // state reset won't work anymore in react v11,
+                // plus I am not sure how it is supposed to work,
+                // if namespace was just reset to zero
+                // component.setState({currentNamespace: namespace.currentNamespace,
+                //                     members: list.members(namespace.currentNamespace)});
             });
         },
 
         activateRecord: function(k, id, componentFunction) {
-            /* console.log('Record', k, ' :', id); */
-
-            $('#inlineSearchContainer').show();
             conjur.app.kind = conjur.utils.pluralize(k);
             this.setActiveNav(conjur.app.kind);
 
@@ -73,9 +83,11 @@
                     component,
                     document.getElementById('content')
                 );
-            }, function(status, text, xhr) {
-                if (status == 403) {
-                    conjur.app.flash = 'You are not authorized to view ' + conjur.app.kind + ':' + id + '.';
+            }, function(status, text) {
+                if (status === 403) {
+                    conjur.app.flash = 'You are not authorized to view ' +
+                        conjur.app.kind + ':' + id + '.';
+
                     window.history.back();
                 } else {
                     console.error('HTTP error: ', status, text);
@@ -89,7 +101,6 @@
         },
 
         dashboard: function() {
-            $('#inlineSearchContainer').hide();
             React.renderComponent(
                 <Dashboard />,
                 document.getElementById('content')
@@ -98,77 +109,92 @@
 
         user: function(user) {
             this.activateRecord('user', user, function(record) {
-                return <User data={record}/>;
+                return (
+                  <User data={record}/>
+                );
             });
         },
 
         users: function() {
-            $('#inlineSearchContainer').show();
             conjur.app.kind = 'users';
 
             this.activateList(function(list) {
-                return <UserBox data={{namespaces: list.namespaces, members: list.members('')}} />;
+                return (
+                  <UserBox data={{namespaces: list.namespaces, members: list.members('')}} />
+                );
             });
         },
 
         group: function(group) {
             this.activateRecord('group', group, function(record) {
-                return <Group data={record} />;
+                return (
+                  <Group data={record} />
+                );
             });
         },
 
         groups: function() {
-            $('#inlineSearchContainer').show();
             conjur.app.kind = 'groups';
 
             this.activateList(function(list) {
-                return <GroupBox data={{namespaces: list.namespaces, members: list.members('')}} />;
+                return (
+                  <GroupBox data={{namespaces: list.namespaces, members: list.members('')}} />
+                );
             });
         },
 
-        host: function(host){
+        host: function(host) {
             this.activateRecord('host', host, function(record) {
-                return <Host data={record}/>;
+                return (
+                  <Host data={record}/>
+                );
             });
         },
 
         hosts: function() {
-            $('#inlineSearchContainer').show();
             conjur.app.kind = 'hosts';
             var HostBox = conjur.views.HostBox;
 
             this.activateList(function(list) {
-                return <HostBox data={{namespaces: list.namespaces, members: list.members('')}} />;
+                return (
+                  <HostBox data={{namespaces: list.namespaces, members: list.members('')}} />
+                );
             });
         },
 
         layer: function(layer) {
             this.activateRecord('layer', layer, function(record) {
-                return <Layer data={record} />;
+                return (
+                  <Layer data={record} />
+                );
             });
         },
 
         layers: function() {
-            $('#inlineSearchContainer').show();
             conjur.app.kind = 'layers';
 
             this.activateList(function(list) {
-                return <LayerBox data={{namespaces: list.namespaces, members: list.members('')}} />;
+                return (
+                  <LayerBox data={{namespaces: list.namespaces, members: list.members('')}} />
+                );
             });
         },
 
         variable: function(variable) {
             this.activateRecord('variable', variable, function(record) {
-                return <Variable data={record} />;
+                return (
+                  <Variable data={record} />
+                );
             });
         },
 
         variables: function() {
-            $('#inlineSearchContainer').show();
             conjur.app.kind = 'variables';
 
             this.activateList(function(list) {
-                return <VariableBox data={{namespaces: list.namespaces, members: list.members('')}} />;
+                return (
+                  <VariableBox data={{namespaces: list.namespaces, members: list.members('')}} />
+                );
             });
         },
 
@@ -176,30 +202,41 @@
             conjur.app.kind = 'policies';
 
             this.activateList(function(list) {
-                return <PolicyBox data={{members: list.members('')}} />;
+                return (
+                  <PolicyBox data={{members: list.members('')}} />
+                );
             });
         },
 
         policy: function(policy) {
             this.activateRecord('policy', policy, function(record) {
-                return <Policy data={record} />;
+                return (
+                  <Policy data={record} />
+                );
             });
         },
 
-        audit: function(){
-            $('#inlineSearchContainer').show();
+        audit: function() {
             this.setActiveNav('audit');
 
+            var GlobalAudit = window.GlobalAudit;
+
             React.renderComponent(
                 <GlobalAudit/>,
                 document.getElementById('content')
             );
         },
 
-        search: function(search){
-            $('#inlineSearchContainer').show();
+        search: function(search) {
             SearchResults.search(search);
         }
     });
 
-})(conjur, jQuery, _, Backbone, React, SearchResults);
+})
+(
+    conjur,
+    jQuery,
+    _,
+    Backbone,
+    React
+);

data/public/js/views/annotations.js

@@ -1,36 +1,47 @@
 /** @jsx React.DOM */
+/* global conjur, React */
 
-var AnnotationsBox = React.createClass({
-  render: function() {
-    
-     if (!this.props.annotations || !this.props.annotations.length>0 ) {
-        return <div>
-                <span>None</span>   
-               </div>;
-     }
+(function(conjur, React) {
+    'use strict';
 
-    // TODO: sort by date (optionally)
-    // TODO: table view
-   var annotations_list = [];
-   this.props.annotations.sort(function(a,b) {
-                            return a.name.toLowerCase().localeCompare(b.name.toLowerCase());
-                         }).forEach(function(item){
-                            var itemname = item.name;
-                            var itemvalue = item.value;
+    this.AnnotationsBox = React.createClass({
+        render: function() {
+            if (!this.props.annotations || this.props.annotations.length === 0) {
+                return (
+                  <div>
+                    <span>None</span>
+                  </div>
+                );
+            }
 
-                            var dt_key = "annotation_"+itemname+"_key";
-                            var dd_key = "annotation_"+itemname+"_value";
-                            
-                            annotations_list.push(<dt key={dt_key}>{itemname}</dt>);
-                            annotations_list.push(<dd key={dd_key}>{itemvalue}</dd>);
-                            });
+            // TODO: sort by date (optionally)
+            // TODO: table view
+            var annotationsList = [];
 
+            this.props.annotations.sort(function(a, b) {
+                return a.name.toLowerCase().localeCompare(b.name.toLowerCase());
+            }).forEach(function(item) {
+                var itemName = item.name,
+                    itemValue = item.value,
+                    term = 'annotation_' + itemName + '_key',
+                    description = 'annotation_' + itemName + '_value';
 
-    return <div> 
-                <dl className="annotations dl-horizontal">
-                    {annotations_list}
+                annotationsList.push(<dt key={term}>{itemName}</dt>);
+                annotationsList.push(<dd key={description}>{itemValue}</dd>);
+            });
+
+            return (
+              <div>
+                <dl className="annotations">
+                  {annotationsList}
                 </dl>
-           </div>;
-  }
- }
+              </div>
+            );
+        }
+    });
+
+}).bind(conjur.views)
+(
+    conjur,
+    React
 );

data/public/js/views/audit.js

@@ -6,7 +6,7 @@
   ref$ = React.DOM, em = ref$.em, strong = ref$.strong, table = ref$.table, div = ref$.div, th = ref$.th, tr = ref$.tr, td = ref$.td, thead = ref$.thead, tbody = ref$.tbody, section = ref$.section, h3 = ref$.h3, time = ref$.time;
   ref$ = require('prelude-ls'), map = ref$.map, each = ref$.each, unique = ref$.unique, isType = ref$.isType, join = ref$.join;
   compact_fields = ['auditview_user', 'auditview_action'];
-  //extended_fields = ['timestamp', 'user', 'acting_as', 'action', 'entities', 'privilege','human'];    
+  //extended_fields = ['timestamp', 'user', 'acting_as', 'action', 'entities', 'privilege','human'];
   extended_fields = ['timestamp','auditview_user','auditview_action'];
   known_rolsource_types = [ 'user','group','host','layer','policy']; // what if somebody explicitly will create the role of such type?
   FieldsMixin = {
@@ -57,7 +57,10 @@
     // TODO: make message a separate React Class
     humanizeEvent: function(e) {
       // copy of SHORT_FORMATS logic from cli-ruby:lib/conjur/command/audit.rb
-      var msg="";
+      var msg=[];
+
+      var ResourceLink = conjur.views.ResourceLink;
+      var RoleLink = conjur.views.RoleLink;
 
       if ((e.kind=='resource') && (e.action=='check')) {
       	msg = [ ]
@@ -84,7 +87,7 @@
       } else if ((e.kind=="resource") && (e.action=="permit")) {
       	msg = [ " permitted ", RoleLink({id: e.grantee, noIcon: true}), " to ", em({}, e.privilege), " ", ResourceLink({id: e.resource, noIcon: true}) ]
         if ( e.grant_option )
-        	msg.push(" with grant option"); 
+        	msg.push(" with grant option");
       } else if ((e.kind=="resource") && (e.action=="deny")) {
         msg = [ " denied ", em({}, e.privilege), " from ", RoleLink({id: e.grantee, noIcon: true}), " on ", ResourceLink({id: e.resource, noIcon: true}) ];
       } else if ((e.kind=="resource") && (e.action=="permitted_roles")) {
@@ -92,14 +95,14 @@
       } else if ((e.kind=="role") && (e.action=="check")) {
       	msg = [ ]
       	if ( e.allowed ) {
-	        msg.push(RoleLink({id: e.role, noIcon: true}))
+	        //msg.push(RoleLink({id: e.role, noIcon: true}))
 	        msg.push(" performed ");
 	        msg.push(em({}, e.privilege));
 	        msg.push(" on ");
 	        msg.push(ResourceLink({id: e.resource, noIcon: true}));
       	}
       	else {
-	        msg.push(RoleLink({id: e.role, noIcon: true}))
+	        //msg.push(RoleLink({id: e.role, noIcon: true}))
 	        msg.push(" was ");
 	        msg.push(strong({}, "denied permission"));
 	        msg.push(" to ");
@@ -126,32 +129,35 @@
         var parts = [action_part];
         if (e.role!=null) {
         	parts.push(" by ");
-        	parts.push(RoleLink({id: e.role, noIcon: true})); 
+        	parts.push(RoleLink({id: e.role, noIcon: true}));
         }
-        if (e.resource_id!=null) { 
+        if (e.resource_id!=null) {
         	parts.push(" on");
-        	parts.push(ResourceLink({id: e.resource_id, noIcon: true})); 
+        	parts.push(ResourceLink({id: e.resource_id, noIcon: true}));
         }
-        if (e.allowed!=null) { 
-        	parts.push(" (allowed: "+e.allowed+")"); 
+        if (e.allowed!=null) {
+        	parts.push(" (allowed: "+e.allowed+")");
         }
         var statement = parts.join(" ");
         msg = [" reported ", parts ];
-        if (e.audit_message!=null) { 
+        if (e.audit_message!=null) {
             msg.push("; message: ");
             msg.push(e.audit_message);
         }
       } else {
-        msg+=" unknown event: "+e.kind+":"+e.action+"!";
-      } 
+        msg.push(" unknown event: "+e.kind+":"+e.action+"!");
+      }
 
       if (e.error!=null) {
-        msg+=" (failed with "+e.error+")";
+        msg.push(" (failed with "+e.error+")");
       }
 
       return msg;
     },
     transformField: function(key, value){
+      var ResourceLink = conjur.views.ResourceLink;
+      var RoleLink = conjur.views.RoleLink;
+
       var that;
       switch (key) {
       case 'entities':
@@ -179,7 +185,7 @@
         break;
       case 'auditview_user': //virtual field
         var acting_user =this.props.user;
-        var acting_role = this.props.acting_as;      
+        var acting_role = this.props.acting_as;
         msg = [ RoleLink({id: acting_user}) ];
         if ((acting_role!=null) && (acting_role != acting_user)) {
             msg.push([" as ", RoleLink({id: acting_role})]);
@@ -192,7 +198,7 @@
           });
         }
         break;
-      case 'auditview_action': 
+      case 'auditview_action':
         return this.humanizeEvent(this.props);
       default:
         return value;
@@ -233,7 +239,7 @@
         events: newEventSet()
       };
     },
-    knownRolsourceTypes: function() { 
+    knownRolsourceTypes: function() {
       return  ;
     },
     render: function(){
@@ -250,7 +256,7 @@
             compact: compact
           }), tbody({
             key: 'tbody'
-          }, this.state.events.filter(function(ev){ 
+          }, this.state.events.filter(function(ev){
                // remove internal resources creation
                if ((ev.role!=null) && (ev.role.split(':')[1] == '@')) {
                  return false;
@@ -270,12 +276,12 @@
                  var rolekind = ev.role.split(':')[1];
                  if (_.contains(known_rolsource_types, rolekind)) {
                     return false;
-                 } 
-               } 
+                 }
+               }
                return true;
             }).map(function(it){
                 // new way to clone objects, custom clone$ does not work no more as expected
-                var ref$ = React.addons.update(it, {$merge: {key: it.id, compact: compact} }); 
+                var ref$ = React.addons.update(it, {$merge: {key: it.id, compact: compact} });
                 return new AuditEntry(ref$);
           }))
         ])
@@ -288,7 +294,7 @@
     },
     componentWillUnmount: function(){
       return each(function(it){
-        console.log("closing event source ", it);
+        // console.log("closing event source ", it);
         return it.close();
       })(
       this.sources);
@@ -308,9 +314,9 @@
     },
     addSource: function(url){
       var evtSrc;
-      console.log("opening eventsource to " + url);
+      // console.log("opening eventsource to " + url);
       evtSrc = new EventSource(url);
-      console.log(evtSrc);
+      // console.log(evtSrc);
       evtSrc.onmessage = this.addEvent;
       evtSrc.onerror = function(a, b, c, d){
         return console.log(a, b, c, d);
@@ -345,7 +351,7 @@
       resources);
       things = join(', ')(
       unique(
-      roles.concat(resources))); 
+      roles.concat(resources)));
 
       var options= { src: roleSrcs.concat(resSrcs) };
       if (this.props.tabview==null) {