]> git.wh0rd.org - tt-rss.git/commitdiff
git.wh0rd.org / tt-rss.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4e70344)
api: add workaround to disable OTP
authorAndrew Dolgov <fox@madoka.volgo-balt.ru>
Mon, 3 Sep 2012 18:32:24 +0000 (22:32 +0400)
committerAndrew Dolgov <fox@madoka.volgo-balt.ru>
Mon, 3 Sep 2012 18:32:24 +0000 (22:32 +0400)
api/index.php patch | blob | blame | history
classes/auth/internal.php patch | blob | blame | history

diff --git a/api/index.php b/api/index.php
index 2d555678fec25ffb9d523294bbab5b4809ccf17b..c3199857be63d859d279492f6d9c57e8d353b158 100644 (file)
--- a/api/index.php
+++ b/api/index.php
@@ -14,6 +14,8 @@
        require_once "db-prefs.php";
        require_once "functions.php";
 
+       define('AUTH_DISABLE_OTP', true);
+
        if (defined('ENABLE_GZIP_OUTPUT') && ENABLE_GZIP_OUTPUT &&
                        function_exists("ob_gzhandler")) {
 
diff --git a/classes/auth/internal.php b/classes/auth/internal.php
index da2d3668fcbf0d2e937ce429904c60cd0e95b68d..0254d60e0dc4aaed92c4f498177572a45ea714a1 100644 (file)
--- a/classes/auth/internal.php
+++ b/classes/auth/internal.php
@@ -9,43 +9,45 @@ class Auth_Internal extends Auth_Base {
                $otp = db_escape_string($_REQUEST["otp"]);
 
                if (get_schema_version($this->link) > 96) {
-                       $result = db_query($this->link, "SELECT otp_enabled,salt FROM ttrss_users WHERE
-                               login = '$login'");
-
-                       if (db_num_rows($result) > 0) {
-                               require_once "lib/otphp/vendor/base32.php";
-                               require_once "lib/otphp/lib/otp.php";
-                               require_once "lib/otphp/lib/totp.php";
-
-                               $base32 = new Base32();
-
-                               $otp_enabled = sql_bool_to_bool(db_fetch_result($result, 0, "otp_enabled"));
-                               $secret = $base32->encode(sha1(db_fetch_result($result, 0, "salt")));
-
-                               $topt = new \OTPHP\TOTP($secret);
-                               $otp_check = $topt->now();
-
-                               if ($otp_enabled) {
-                                       if ($otp) {
-                                               if ($otp != $otp_check) {
-                                                       return false;
+                       if (!defined('AUTH_DISABLE_OTP') || !AUTH_DISABLE_OTP) {
+                               $result = db_query($this->link, "SELECT otp_enabled,salt FROM ttrss_users WHERE
+                                       login = '$login'");
+
+                               if (db_num_rows($result) > 0) {
+                                       require_once "lib/otphp/vendor/base32.php";
+                                       require_once "lib/otphp/lib/otp.php";
+                                       require_once "lib/otphp/lib/totp.php";
+
+                                       $base32 = new Base32();
+
+                                       $otp_enabled = sql_bool_to_bool(db_fetch_result($result, 0, "otp_enabled"));
+                                       $secret = $base32->encode(sha1(db_fetch_result($result, 0, "salt")));
+
+                                       $topt = new \OTPHP\TOTP($secret);
+                                       $otp_check = $topt->now();
+
+                                       if ($otp_enabled) {
+                                               if ($otp) {
+                                                       if ($otp != $otp_check) {
+                                                               return false;
+                                                       }
+                                               } else {
+                                                       ?><html>
+                                                               <head><title>Tiny Tiny RSS</title></head>
+                                                       <body>
+                                                       <form method="POST">
+                                                               <input type="hidden" name="login_action" value="do_login">
+                                                               <input type="hidden" name="login" value="<?php echo htmlspecialchars($login) ?>">
+                                                               <input type="hidden" name="password" value="<?php echo htmlspecialchars($password) ?>">
+
+                                                               <label><?php echo __("Please enter your one time password:") ?></label>
+                                                               <input type="password" size="6" name="otp"/>
+                                                               <input type="submit" value="Continue"/>
+                                                       </form>
+                                                       </form>
+                                                       <?php
+                                                       exit;
                                                }
-                                       } else {
-                                               ?><html>
-                                                       <head><title>Tiny Tiny RSS</title></head>
-                                               <body>
-                                               <form method="POST">
-                                                       <input type="hidden" name="login_action" value="do_login">
-                                                       <input type="hidden" name="login" value="<?php echo htmlspecialchars($login) ?>">
-                                                       <input type="hidden" name="password" value="<?php echo htmlspecialchars($password) ?>">
-
-                                                       <label><?php echo __("Please enter your one time password:") ?></label>
-                                                       <input type="password" size="6" name="otp"/>
-                                                       <input type="submit" value="Continue"/>
-                                               </form>
-                                               </form>
-                                               <?php
-                                               exit;
                                        }
                                }
                        }
web-based news feed (RSS/Atom) reader and aggregator; see https://tt-rss.org/