Update class.OtpAuthFrontend.php

pydio · Sep 11, 2014 · 22ba3d2 · 22ba3d2
1 parent b27ed18
commit 22ba3d2
Showing 1 changed file with 16 additions and 10 deletions.
diff --git a/core/src/plugins/authfront.otp/class.OtpAuthFrontend.php b/core/src/plugins/authfront.otp/class.OtpAuthFrontend.php
@@ -25,10 +25,10 @@ class OtpAuthFrontend extends AbstractAuthFrontend
 /*
     private $enable_Create_User;
     private $modifyLoginScreen;
-    private $userFilePath;
+    private $userFilePath;*/
+
     private $yubicoSecretKey;
     private $yubicoClientId;
-*/
     private $google;
     private $googleLast;
     private $yubikey1;
@@ -59,7 +59,7 @@ function tryToLogUser(&$httpVars, $isLast = false)
             if(strlen($httpVars["password"]) > 6){
                 $codeOTP = substr($httpVars["password"], -6);
             }else{
-                throw new Excetion($exceptionMsg);
+                throw new AJXP_Excetion($exceptionMsg);
                 //return $this->FalseAndClearPassword($httpVars);
             }
 
@@ -75,7 +75,7 @@ function tryToLogUser(&$httpVars, $isLast = false)
                     return false;
                 }
                 else{
-                    throw new Excetion($exceptionMsg);
+                    throw new AJXP_Excetion($exceptionMsg);
                 }
             }elseif
             // YubiKey1 or YubiKey2 set
@@ -85,7 +85,7 @@ function tryToLogUser(&$httpVars, $isLast = false)
                if ($this->checkYubiPass($httpVars["password"], $this->yubikey1, $this->yubikey2)){
                    return false;
                }else{
-                   throw new Excetion($exceptionMsg);
+                   throw new AJXP_Excetion($exceptionMsg);
                }
             }elseif
             // Both Yubikey and Google Authenticator set
@@ -96,19 +96,19 @@ function tryToLogUser(&$httpVars, $isLast = false)
                     return false;
                 }
                 else{
-                    throw new Excetion($exceptionMsg);
+                    throw new AJXP_Excetion($exceptionMsg);
                 }
             }
             else{
                 if ($this->checkYubiPass($httpVars["password"], $this->yubikey1, $this->yubikey2)){
                     return false;
                 }
                 else{
-                    throw new Excetion($exceptionMsg);
+                    throw new AJXP_Excetion($exceptionMsg);
                 }
             }
         }
-        throw new Excetion($exceptionMsg);
+        throw new AJXP_Excetion($exceptionMsg);
         //return $this->FalseAndClearPassword($httpVars);
     }
 
@@ -132,6 +132,12 @@ private function loadConfig($userid)
         $this->yubikey2 = !empty($roleData["PARAMETERS"]["AJXP_REPO_SCOPE_ALL"]["authfront.otp"]["yubikey2"]) ?
             $roleData["PARAMETERS"]["AJXP_REPO_SCOPE_ALL"]['authfront.otp']["yubikey2"] : '';
 
+        if (!empty($this->pluginConf["YUBICO_CLIENT_ID"])) {
+            $this->yubicoClientId = trim($this->pluginConf["YUBICO_CLIENT_ID"]);
+        }
+        if (!empty($this->pluginConf["YUBICO_SECRET_KEY"])) {
+            $this->$yubicoSecretKey = trim($this->pluginConf["YUBICO_SECRET_KEY"]);
+        }
     }
 
     // Google Authenticator
@@ -258,7 +264,7 @@ public function checkYubiPass($pass, $yubikey1, $yubikey2)
         $yotp = substr($pass, -44);
         $pass = substr($pass, 0, strlen($pass) - 44);
 
-        $yubi = new Auth_Yubico($this->yubico_client_id, $this->yubico_secret_key);
+        $yubi = new Auth_Yubico($this->yubicoClientId, $this->yubicoSecretKey);
         $auth = $yubi->verify($yotp);
 
         return (!PEAR::isError($auth));
@@ -268,4 +274,4 @@ private function FalseAndClearPassword(&$httpVars){
         $httpVars["password"] = "";
         return false;
     }
-}
+}