Merge pull request #275 from skadefro/master

up
open-rpa · Aug 12, 2023 · 75b1f1c · 75b1f1c
2 parents 0759da4 + 42a2ba5
commit 75b1f1c
Show file tree

Hide file tree

Showing 13 changed files with 103 additions and 58 deletions.
diff --git a/OpenFlow/src/DatabaseConnection.ts b/OpenFlow/src/DatabaseConnection.ts
@@ -2016,18 +2016,18 @@ export class DatabaseConnection extends events.EventEmitter {
                         Base.addRight(item, user._id, user.name, [Rights.full_control]);
                     }
                     item = this.ensureResource(item, collectionname);
-                    // Logger.instanse.silly("Adding " + item._type + " " + name + " to database", span, { collection: collectionname, user: user.username });
-                    // if (!DatabaseConnection.hasAuthorization(user, item, Rights.create)) { throw new Error("Access denied, no authorization to InsertOne " + item._type + " " + name + " to database"); }
-                } else if (DatabaseConnection.istimeseries(collectionname) && !DatabaseConnection.usemetadata(collectionname)) {
-
+                // } else if (DatabaseConnection.istimeseries(collectionname) && !DatabaseConnection.usemetadata(collectionname)) { 
+                } else if (DatabaseConnection.istimeseries(collectionname)) { 
                     if(NoderedUtil.IsNullEmpty(item[DatabaseConnection.timefield(collectionname)])) {
                         item[DatabaseConnection.timefield(collectionname)] = new Date(new Date().toISOString());
                     }
-                    if (!DatabaseConnection.hasAuthorization(user, item, Rights.full_control)) {
-                        Base.addRight(item, user._id, user.name, [Rights.full_control]);
-                        item = this.ensureResource(item, collectionname);
+                    if(DatabaseConnection.usemetadata(collectionname)) {
+                        if (!DatabaseConnection.hasAuthorization(user, item, Rights.full_control)) {
+                            Base.addRight(item, user._id, user.name, [Rights.full_control]);
+                            item = this.ensureResource(item, collectionname);
+                        }
                     }
-                } else {                    
+                } else { // fs.files ?
                     if(NoderedUtil.IsNullEmpty(item[DatabaseConnection.timefield(collectionname)])) {
                         item[DatabaseConnection.timefield(collectionname)] = new Date(new Date().toISOString());
                     }
@@ -2208,11 +2208,12 @@ export class DatabaseConnection extends events.EventEmitter {
                     }
                 } else if (DatabaseConnection.istimeseries(collectionname) && !DatabaseConnection.usemetadata(collectionname)) {
                 } else {
-                    let metadata = DatabaseConnection.metadataname(collectionname);
-                    item[metadata] = await this.CleanACL(item[metadata], user, collectionname, span);
-                    if (item._type === "role" && collectionname === "users") {
-                        item[metadata] = await this.Cleanmembers(item[metadata] as any, null, false, span);
-                    }
+                    // skip clean acl, to expensive
+                    // let metadata = DatabaseConnection.metadataname(collectionname);
+                    // item[metadata] = await this.CleanACL(item[metadata], user, collectionname, span);
+                    // if (item._type === "role" && collectionname === "users") {
+                    //     item[metadata] = await this.Cleanmembers(item[metadata] as any, null, false, span);
+                    // }
                 }
 
 
@@ -4324,10 +4325,14 @@ export class DatabaseConnection extends events.EventEmitter {
             return true;
         }
         if(collectionname == "fullDocument._acl") return true;
-        if(Config.metadata_collections.indexOf(collectionname) > -1) {
-            const metadataname = DatabaseConnection.timeseries_collections_metadata[collectionname];
-            if(!NoderedUtil.IsNullEmpty(metadataname)) return true;
-        }
+        // old way
+        // if(Config.metadata_collections.indexOf(collectionname) > -1) {
+        //     const metadataname = DatabaseConnection.timeseries_collections_metadata[collectionname];
+        //     if(!NoderedUtil.IsNullEmpty(metadataname)) return true;
+        // }
+        const metadataname = DatabaseConnection.timeseries_collections_metadata[collectionname];
+        if(metadataname == "metadata") return true;
+        // if(!NoderedUtil.IsNullEmpty(metadataname)) return true;
         return false;
     }
     static metadataname(collectionname: string) {

diff --git a/OpenFlow/src/Logger.ts b/OpenFlow/src/Logger.ts
@@ -235,6 +235,7 @@ export class Logger {
         this.json(obj, span);
     }
     public verbose(message: string, span: Span, options?: any) {
+        if(!Config.log_verbose) return;
         var s = Logger.getStackInfo(0);
         if (s.method == "") s = Logger.getStackInfo(1);
         if (s.method == "") s = Logger.getStackInfo(2);

diff --git a/OpenFlow/src/WebServer.ts b/OpenFlow/src/WebServer.ts
@@ -119,8 +119,13 @@ export class WebServer {
             });
             this.app.use("/", express.static(path.join(__dirname, "/public")));
             this.app.use(compression());
+            // this.app.use(express.urlencoded({ extended: true }));
+            // this.app.use(express.json());
+            // this.app.use(express.urlencoded({ extended: true, limit: '50mb', parameterLimit:50000 }));
+            // this.app.use(express.json({limit: '50mb'}));
             this.app.use(express.urlencoded({ extended: true }));
-            this.app.use(express.json());
+            this.app.use(express.json({limit: '150mb'}));
+
             this.app.use(cookieParser());
             this.app.set('trust proxy', 1)
             span?.addEvent("Add cookieSession");

diff --git a/OpenFlow/src/dockerdriver.ts b/OpenFlow/src/dockerdriver.ts
@@ -184,7 +184,7 @@ export class dockerdriver implements i_agent_driver {
                 "otel_trace_url=" + Config.otel_trace_url,
                 "otel_metric_url=" + Config.otel_metric_url,
                 "TZ=" + agent.tz,
-                "log_with_colors=false",
+                "log_with_colors=true",
                 "oidc_config=" + oidc_config,
                 "oidc_client_id=" + Config.agent_oidc_client_id,
                 "oidc_client_secret=" + Config.agent_oidc_client_secret,

diff --git a/OpenFlow/src/public/Agent.html b/OpenFlow/src/public/Agent.html
@@ -77,7 +77,7 @@ <h2 class="card-title font-size-18 m-0">
       <div class="px-card py-10 bg-light-lm bg-very-dark-dm rounded-bottom">
         <!-- py-10 = padding-top: 1rem (10px) and padding-bottom: 1rem (10px), bg-light-lm = background-color: var(--gray-color-light) only in light mode, bg-very-dark-dm = background-color: var(--dark-color-dark) only in dark mode, rounded-bottom = rounded corners on the bottom -->
         <p class="font-size-12 m-0"> <!-- font-size-12 = font-size: 1.2rem (12px), m-0 = margin: 0 -->
-        <pre>{{ ctrl.instancelog }}</pre>
+        <pre ng-bind-html="ctrl.instancelog"></pre>
         </p>
       </div>
     </div>

diff --git a/OpenFlow/src/public/Agents.html b/OpenFlow/src/public/Agents.html
@@ -32,6 +32,8 @@ <h1 translate lib="web">agents</h1>
     <tr>
       <th scope="col" ng-click="ctrl.ToggleOrder('name')"><strong translate lib="web">name</strong></th>
       <th scope="col" ng-click="ctrl.ToggleOrder('image')"><strong translate lib="web">image</strong></th>
+      <th scope="col" ng-click="ctrl.ToggleOrder('os')"><strong translate lib="web">os</strong></th>      
+      <th scope="col" ng-click="ctrl.ToggleOrder('arch')"><strong translate lib="web">arch</strong></th>      
       <th scope="col" ng-click="ctrl.ToggleOrder('_createdby')"><strong translate lib="web">createdby</strong></th>
       <th scope="col" ng-click="ctrl.ToggleOrder('status')"><strong translate lib="web">status</strong></th>
       <th class="text-right"></th>
@@ -44,6 +46,8 @@ <h1 translate lib="web">agents</h1>
         <a ng-show="model.image == '' || model.image == null" ng-href="#/RunPackage/{{model._id}}">{{model.name | limitTo: 20}}</a>
       </td>
       <td>{{ctrl.trimimage(model.image)}}</td>
+      <td>{{model.os | limitTo: 20}}</td>
+      <td>{{model.arch | limitTo: 20}}</td>
       <td>{{model._createdby | limitTo: 20}}</td>
       <td>{{model.status | limitTo: 20}}</td>
       <td class="text-right">

diff --git a/OpenFlow/src/public/CommonControllers.ts b/OpenFlow/src/public/CommonControllers.ts
@@ -874,6 +874,7 @@ export class entityCtrl<T> {
         "$scope",
         "$location",
         "$routeParams",
+        "$sce",
         "$interval",
         "WebSocketClientService",
         "api",
@@ -884,10 +885,11 @@ export class entityCtrl<T> {
         public $scope: ng.IScope,
         public $location: ng.ILocationService,
         public $routeParams: ng.route.IRouteParamsService,
+        public $sce: ng.ISCEService,
         public $interval: ng.IIntervalService,
         public WebSocketClientService: WebSocketClientService,
         public api: api,
-        public userdata: userdata
+        public userdata: userdata,
     ) {
         this.id = $routeParams.id;
         this.basequery = { _id: this.id };