Changes to make keystore and ws_authenticate work for Websocket

pydio · May 23, 2016 · c70b435 · cdujeu · Jun 4, 2016 · c70b435
1 parent 4bac0a7
commit c70b435
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/core/src/plugins/authfront.keystore/manifest.xml b/core/src/plugins/authfront.keystore/manifest.xml
@@ -39,7 +39,7 @@
             </component_config>
         </client_configs>
         <actions>
-            <action name="keystore_generate_auth_token">
+            <action name="keystore_generate_auth_token" skipSecureToken="true">
                 <rightsContext adminOnly="false" noUser="false" read="false" userLogged="true" write="false"/>
                 <processing>
                     <serverCallback methodName="authTokenActions" restParams="/device" sdkMethodName="generateAuthToken" developerComment="Generate and store a authentication key that can be used by the currently logged user. Used by SDKs talking to REST API to avoid renegociating basic auth on each query.">

diff --git a/core/src/plugins/core.mq/class.MqManager.php b/core/src/plugins/core.mq/class.MqManager.php
@@ -303,9 +303,9 @@ public function wsAuthenticate($action, $httpVars, $fileVars)
     {
         $this->logDebug("Entering wsAuthenticate");
         $configs = $this->getConfigs();
-        if (!isSet($httpVars["key"]) || $httpVars["key"] != $configs["WS_SERVER_ADMIN"]) {
+        /*if (!isSet($httpVars["key"]) || $httpVars["key"] != $configs["WS_SERVER_ADMIN"]) {
             throw new Exception("Cannot authentify admin key");
-        }
+        }*/
         $user = AuthService::getLoggedUser();
         if ($user == null) {
             $this->logDebug("Error Authenticating through WebSocket (not logged)");

diff --git a/core/src/plugins/core.mq/manifest.xml b/core/src/plugins/core.mq/manifest.xml
@@ -73,7 +73,7 @@
             </action>
             <action name="ws_authenticate" skipSecureToken="true">
                 <processing>
-                    <serverCallback methodName="wsAuthenticate"/>
+                    <serverCallback restParams="/" methodName="wsAuthenticate"/>
                 </processing>
             </action>
         </actions>