Secure preferences improvements

src/wirecloud/commons/baseviews/resource.py

@@ -31,6 +31,7 @@
     'PUT': 'update',
     'DELETE': 'delete',
     'HEAD': 'head',
+    'PATCH': 'patch',
 }
 
 

src/wirecloud/commons/fixtures/user_with_workspaces.json

@@ -280,6 +280,16 @@
             "creator": 4
         }
     },
+    {
+        "model": "platform.Workspace",
+        "pk": 202,
+        "fields": {
+            "name": "workspaceSecure",
+            "public": false,
+            "creator": "4",
+            "wiringStatus": "{\"operators\": {\"1\": {\"name\": \"Wirecloud/TestOperatorSecure/1.0\", \"preferences\": {\"pref_secure\": {\"secure\": true, \"readonly\": false, \"hidden\": false, \"value\": \"\"}, \"username\": {\"secure\": false, \"readonly\": true, \"hidden\": false, \"value\": \"username\"}}}, \"2\": {\"name\": \"Wirecloud/TestOperatorSecure/1.0\", \"preferences\": {\"pref_secure\": {\"secure\": true, \"readonly\": false, \"hidden\": false, \"value\": \"test_password\"}, \"username\": {\"secure\": false, \"readonly\": true, \"hidden\": false, \"value\": \"test_username\"}}}}, \"connections\": []}"
+        }
+    },
     {
         "pk": 2,
         "model": "platform.userworkspace",

src/wirecloud/platform/core/plugins.py

@@ -603,6 +603,8 @@ def get_ajax_endpoints(self, view):
             {'id': 'WORKSPACE_PUBLISH', 'url': build_url_template('wirecloud.workspace_publish', ['workspace_id'])},
             {'id': 'WORKSPACE_RESOURCE_COLLECTION', 'url': build_url_template('wirecloud.workspace_resource_collection', ['workspace_id'])},
             {'id': 'WORKSPACE_VIEW', 'url': build_url_template('wirecloud.workspace_view', ['owner', 'name'])},
+
+            {'id': 'OPERATOR_PREFERENCES', 'url': build_url_template('wirecloud.workspace_operator_preferences', ['workspace_id', 'operator_id'])},
         )
 
         from django.conf import settings

src/wirecloud/platform/fixtures/test_data.json

@@ -73,6 +73,16 @@
             "wiringStatus": "{\"operators\": {}, \"connections\": []}"
         }
     },
+    {
+        "model": "platform.Workspace",
+        "pk": "202",
+        "fields": {
+            "name": "workspaceSecure",
+            "public": false,
+            "creator": "2",
+            "wiringStatus": "{\"operators\": {\"1\": {\"name\": \"Wirecloud/TestOperatorSecure/1.0\", \"preferences\": {\"pref_secure\": {\"secure\": true, \"readonly\": false, \"hidden\": false, \"value\": \"\"}, \"username\": {\"secure\": false, \"readonly\": false, \"hidden\": false, \"value\": \"username\"}}}, \"2\": {\"name\": \"Wirecloud/TestOperatorSecure/1.0\", \"preferences\": {\"pref_secure\": {\"secure\": true, \"readonly\": false, \"hidden\": false, \"value\": \"test_password\"}, \"username\": {\"secure\": false, \"readonly\": false, \"hidden\": false, \"value\": \"test_username\"}}}}, \"connections\": []}"
+        }
+    },
     {
         "model": "platform.UserWorkspace",
         "pk": "1",
@@ -81,6 +91,14 @@
             "workspace": "1"
         }
     },
+    {
+        "model": "platform.UserWorkspace",
+        "pk": "2",
+        "fields": {
+            "user": "2",
+            "workspace": "202"
+        }
+    },
     {
         "model": "platform.Tab",
         "pk": "1",
@@ -90,6 +108,15 @@
             "visible": true
         }
     },
+    {
+        "model": "platform.Tab",
+        "pk": "2",
+        "fields": {
+            "workspace": "202",
+            "name": "tabSecure",
+            "visible": true
+        }
+    },
     {
         "model": "platform.IWidget",
         "pk": "1",
@@ -114,6 +141,30 @@
             "variables": "{\"password\": \"test_password\", \"username\": \"test_username\", \"prop\": \"test_data\"}"
         }
     },
+    {
+        "model": "platform.IWidget",
+        "pk": "3",
+        "fields": {
+            "widget": "1",
+            "widget_uri": "Test/Test Widget/1.0.0",
+            "name": "Secure Widget 1",
+            "positions": "{\"widget\":{\"minimized\":false,\"height\":24,\"width\":6,\"zIndex\":0,\"left\":0,\"top\":0,\"fulldragboard\":false},\"icon\":{\"top\":0,\"left\":0}}",
+            "tab": "2",
+            "variables": "{\"password\": \"\", \"username\": \"test_username\", \"prop\": \"test_data\"}"
+        }
+    },
+    {
+        "model": "platform.IWidget",
+        "pk": "4",
+        "fields": {
+            "widget": "1",
+            "widget_uri": "Test/Test Widget/1.0.0",
+            "name": "Secure Widget 2",
+            "positions": "{\"widget\":{\"minimized\":false,\"height\":24,\"width\":6,\"zIndex\":0,\"left\":0,\"top\":0,\"fulldragboard\":false},\"icon\":{\"top\":0,\"left\":0}}",
+            "tab": "2",
+            "variables": "{\"password\": \"test_password\", \"username\": \"test_username\", \"prop\": \"test_data\"}"
+        }
+    },
     {
         "model": "catalogue.CatalogueResource",
         "pk": "1",
@@ -150,6 +201,24 @@
             "users": [2]
         }
     },
+    {
+        "pk": 3,
+        "model": "catalogue.CatalogueResource",
+        "fields": {
+            "groups": [],
+            "template_uri": "Wirecloud_TestOperatorSecure_1.0.wgt",
+            "popularity": "0",
+            "vendor": "Wirecloud",
+            "short_name": "TestOperatorSecure",
+            "json_description": "{\"default_lang\": \"en\", \"vendor\": \"Wirecloud\", \"description\": \"Test operator description\", \"translations\": {}, \"smartphoneimage\": \"\", \"translation_index_usage\": {}, \"title\": \"TestOperator\", \"properties\": [], \"js_files\": [\"js/main.js\"], \"requirements\": [], \"preferences\": [{\"default\": \"\", \"name\": \"pref_secure\", \"secure\": true, \"label\": \"Prefix\", \"type\": \"text\", \"description\": \"\"}, {\"default\": \"\", \"name\": \"username\", \"secure\": false, \"label\": \"Prefix\", \"type\": \"text\", \"description\": \"\"}], \"authors\": \"admin\", \"wiring\": {\"inputs\": [{\"friendcode\": \"test_friend_code\", \"actionlabel\": \"\", \"name\": \"input\", \"label\": \"input\", \"type\": \"text\", \"description\": \"\"}], \"outputs\": [{\"friendcode\": \"test_friend_code\", \"description\": \"\", \"type\": \"text\", \"name\": \"output\", \"label\": \"output\"}]}, \"name\": \"TestOperator\", \"image\": \"images/catalogue.png\", \"version\": \"1.0\", \"context\": [], \"widget_height\": \"\", \"email\": \"[email protected]\", \"type\": \"operator\", \"widget_width\": \"\", \"doc\": \"doc/index.html\"}",
+            "creator": 2,
+            "creation_date": "2011-05-13T11:24:03Z",
+            "version": "1.0",
+            "type": 2,
+            "public": false,
+            "users": [2]
+        }
+    },
     {
         "model": "platform.Widget",
         "pk": "1",

src/wirecloud/platform/static/js/WirecloudAPI/WirecloudAPICommon.js

@@ -29,6 +29,7 @@
     var platform = window.parent;
     var Wirecloud = platform.Wirecloud;
     var resource = MashupPlatform.priv.resource;
+    var componentType = resource instanceof Wirecloud.Widget ? "widget" : "operator";
     var guibuilder = new platform.StyledElements.GUIBuilder();
 
     // HTTP module
@@ -37,6 +38,10 @@
     Object.defineProperty(window.MashupPlatform.http, 'makeRequest', {
         value: function makeRequest(url, options) {
             url = new platform.URL(url, window.location);
+            if (!options.requestHeaders) {
+                options.requestHeaders = {};
+            }
+            options.requestHeaders["wirecloud-component-type"] = componentType;
             return Wirecloud.io.makeRequest(url, options);
         }
     });

src/wirecloud/platform/static/js/wirecloud/Widget/PreferencesWindowMenu.js

@@ -32,14 +32,18 @@
     utils.inherit(PreferencesWindowMenu, Wirecloud.ui.WindowMenu);
 
     PreferencesWindowMenu.prototype._savePrefs = function _savePrefs(form, new_values) {
-        var oldValue, newValue, varName, details;
+        var oldValue, newValue, varName;
 
         for (varName in new_values) {
             oldValue = this.widgetModel.preferences[varName].value;
             newValue = new_values[varName];
 
             if (newValue !== oldValue) {
-                this.widgetModel.preferences[varName].value = newValue;
+                if (this.widgetModel.preferences[varName].meta.options.secure && newValue !== "") {
+                    this.widgetModel.preferences[varName].value = "********";
+                } else {
+                    this.widgetModel.preferences[varName].value = newValue;
+                }
             } else {
                 delete new_values[varName];
             }
@@ -55,15 +59,25 @@
                 method: 'POST',
                 contentType: 'application/json',
                 requestHeaders: {'Accept': 'application/json'},
-                postBody: JSON.stringify(new_values)
+                postBody: JSON.stringify(new_values),
+                onSuccess: widgetCallback.call(this, new_values)
             }
         );
+    };
 
+    // Notify preference changes to widget
+    var widgetCallback = function widgetCallback(new_values) {
         if (typeof this.widgetModel.prefCallback === 'function') {
             try {
+                // Censor secure preferences
+                for (var varName in new_values) {
+                    if (this.widgetModel.preferences[varName].meta.options.secure && this.widgetModel.preferences[varName].value !== "") {
+                        new_values[varName] = "********";
+                    }
+                }
                 this.widgetModel.prefCallback(new_values);
             } catch (error) {
-                details = this.widgetModel.logManager.formatException(error);
+                var details = this.widgetModel.logManager.formatException(error);
                 this.widgetModel.logManager.log(utils.gettext('Exception catched while processing preference changes'), {details: details});
             }
         }

src/wirecloud/platform/static/js/wirecloud/ui/OperatorPreferencesWindowMenu.js

@@ -32,28 +32,46 @@
     utils.inherit(OperatorPreferencesWindowMenu, Wirecloud.ui.WindowMenu);
 
     OperatorPreferencesWindowMenu.prototype._savePrefs = function _savePrefs(form, new_values) {
-        var key, details;
+        var key;
 
         for (key in new_values) {
             if (this._current_ioperator.preferences[key].value !== new_values[key]) {
-                this._current_ioperator.preferences[key].value = new_values[key];
+
+                if (this._current_ioperator.preferences[key].meta.options.secure && new_values[key] !== "") {
+                    this._current_ioperator.preferences[key].value = "********";
+                } else {
+                    this._current_ioperator.preferences[key].value = new_values[key];
+                }
             } else {
                 delete new_values[key];
             }
         }
 
+        this.hide();
+
+        Wirecloud.io.makeRequest(Wirecloud.URLs.OPERATOR_PREFERENCES.evaluate({
+                workspace_id: this._current_ioperator.wiring.workspace.id,
+                operator_id: this._current_ioperator.id
+            }), {
+                method: 'POST',
+                contentType: 'application/json',
+                requestHeaders: {'Accept': 'application/json'},
+                postBody: JSON.stringify(new_values),
+                onSuccess: operatorCallback.call(this, new_values)
+            }
+        );
+    };
+
+    var operatorCallback = function operatorCallback(new_values) {
         if (typeof this._current_ioperator.prefCallback === 'function') {
             try {
                 this._current_ioperator.prefCallback(new_values);
             } catch (error) {
-                details = this._current_ioperator.logManager.formatException(error);
+                var details = this._current_ioperator.logManager.formatException(error);
                 this._current_ioperator.logManager.log(utils.gettext('Exception catched while processing preference changes'), {details: details});
             }
         }
-
-        this.hide();
     };
-
     OperatorPreferencesWindowMenu.prototype.show = function show(ioperator, parentWindow) {
         var i, prefs, pref, fields;