srchub-old Commit Details

Date:

2013-08-10 23:34:00 (11 years 4 months ago)

Author:

Natalie Adams

Branch:

default

Commit:

f1c1e101e3d4

Parents:

41511e0127d9

Message:

Fixing issue with site login OTP

Temporary fix with SVN path commit issue

Changes:

M	indefero/src/IDF/Form/UserAccount.php (1 diff)
M	indefero/src/IDF/Plugin/SyncSvn.php (2 diffs)
M	pluf/src/Pluf/User.php (1 diff)

File differences

-173
174 174
175 175
176 
176
177 177
178 178
179 179
+                                            'help_text' => __('You will get an email to confirm that you own the address you specify.'),␊
                                            ));␊
        $otp = "";␊
        if ($user_data->otpkey != "")␊
        if ($this->user->otpkey != "")␊
            $otp = Pluf_Utils::convBase($this->user->otpkey, '0123456789abcdef', 'abcdefghijklmnopqrstuvwxyz234567');␊
        $this->fields['otpkey'] = new Pluf_Form_Field_Varchar(␊
                                        array('required' => false,␊
                                             'help_text' => __('You will get an email to confirm that you own the address you specify.'),␊
                                             ));␊
         $otp = "";␊
-        if ($user_data->otpkey != "")␊
+        if ($this->user->otpkey != "")␊
             $otp = Pluf_Utils::convBase($this->user->otpkey, '0123456789abcdef', 'abcdefghijklmnopqrstuvwxyz234567');␊
         $this->fields['otpkey'] = new Pluf_Form_Field_Varchar(␊
                                         array('required' => false,␊

-94
95 95
96 96
97 
97
98
99
98 100
99 101
100 102
... ...
105 107
106 108
107 109
108 
110
111
109 112
110 113
111 114
+                                        'output' => $output)));␊
            return;␊
        }␊
        $p = realpath(dirname(__FILE__).'/../../../scripts/svn-post-commit');␊
        // FIX ME␊
        //$p = realpath(dirname(__FILE__).'/../../../scripts/svn-post-commit');␊
        $p = "/home/www/indefero/scripts/svn-post-commit";␊
        exec(sprintf(Pluf::f('idf_exec_cmd_prefix', '').'ln -s %s %s', ␊
                     escapeshellarg($p), ␊
                     escapeshellarg($svn_path.'/'.$shortname.'/hooks/post-commit')),␊

                                 $svn_path.'/'.$shortname.'/hooks/post-commit'));␊
            return;␊
        }␊
        $p = realpath(dirname(__FILE__).'/../../../scripts/svn-post-revprop-change');␊
        //$p = realpath(dirname(__FILE__).'/../../../scripts/svn-post-revprop-change');␊
        $p = "/home/www/indefero/scripts/svn-post-revprop-change";␊
        exec(sprintf(Pluf::f('idf_exec_cmd_prefix', '').'ln -s %s %s', ␊
                     escapeshellarg($p), ␊
                     escapeshellarg($svn_path.'/'.$shortname.'/hooks/post-revprop-change')),␊
 ...
                                         'output' => $output)));␊
             return;␊
         }␊
-        $p = realpath(dirname(__FILE__).'/../../../scripts/svn-post-commit');␊
+        // FIX ME␊
+        //$p = realpath(dirname(__FILE__).'/../../../scripts/svn-post-commit');␊
+        $p = "/home/www/indefero/scripts/svn-post-commit";␊
         exec(sprintf(Pluf::f('idf_exec_cmd_prefix', '').'ln -s %s %s', ␊
                      escapeshellarg($p), ␊
                      escapeshellarg($svn_path.'/'.$shortname.'/hooks/post-commit')),␊
                                  $svn_path.'/'.$shortname.'/hooks/post-commit'));␊
             return;␊
         }␊
-        $p = realpath(dirname(__FILE__).'/../../../scripts/svn-post-revprop-change');␊
+        //$p = realpath(dirname(__FILE__).'/../../../scripts/svn-post-revprop-change');␊
+        $p = "/home/www/indefero/scripts/svn-post-revprop-change";␊
         exec(sprintf(Pluf::f('idf_exec_cmd_prefix', '').'ln -s %s %s', ␊
                      escapeshellarg($p), ␊
                      escapeshellarg($svn_path.'/'.$shortname.'/hooks/post-revprop-change')),␊

-271
272 272
273 273
274 
274
275 275
276 276
277 277
+        } else {␊
            $otp = substr($password, 0, 6);␊
            $pass = substr($password, 6);␊
            $totp = new \OTPHP\TOTP(strtoupper($this->otpkey));␊
            $totp = new \OTPHP\TOTP(strtoupper(Pluf_Utils::convBase($this->otpkey, '0123456789abcdef', 'abcdefghijklmnopqrstuvwxyz234567')));␊
            if ($totp->verify($otp) && $this->password == base64_encode(sha1($pass, TRUE)))␊
            {␊
                return true;␊
         } else {␊
             $otp = substr($password, 0, 6);␊
             $pass = substr($password, 6);␊
-            $totp = new \OTPHP\TOTP(strtoupper($this->otpkey));␊
+            $totp = new \OTPHP\TOTP(strtoupper(Pluf_Utils::convBase($this->otpkey, '0123456789abcdef', 'abcdefghijklmnopqrstuvwxyz234567')));␊
             if ($totp->verify($otp) && $this->password == base64_encode(sha1($pass, TRUE)))␊
             {␊
                 return true;␊

Download the corresponding diff file

srchub-old

File differences

Branches

Tags