필요 없는 코드 제거 및 로그인 카운터 폐지

route/bbs_w_edit.py

@@ -41,8 +41,6 @@ def bbs_w_edit(bbs_num = '', post_num = '', comment_num = ''):
         if flask.request.method == 'POST':
             if captcha_post(conn, flask.request.form.get('g-recaptcha-response', flask.request.form.get('g-recaptcha', ''))) == 1:
                 return re_error(conn, '/error/13')
-            else:
-                captcha_post(conn, '', 0)
         
             if post_num == '':
                 curs.execute(db_change('select set_code from bbs_data where set_name = "title" and set_id = ? order by set_code + 0 desc'), [bbs_num_str])

route/bbs_w_post.py

@@ -88,8 +88,6 @@ def bbs_w_post(bbs_num = '', post_num = ''):
                 
                 if captcha_post(conn, flask.request.form.get('g-recaptcha-response', flask.request.form.get('g-recaptcha', ''))) == 1:
                     return re_error(conn, '/error/13')
-                else:
-                    captcha_post(conn, '', 0)
 
                 set_id = bbs_num_str + '-' + post_num_str
 
@@ -175,8 +173,6 @@ def bbs_w_post(bbs_num = '', post_num = ''):
                 
                 if captcha_post(conn, flask.request.form.get('g-recaptcha-response', flask.request.form.get('g-recaptcha', ''))) == 1:
                     return re_error(conn, '/error/13')
-                else:
-                    captcha_post(conn, '', 0)
                 
                 select = flask.request.form.get('comment_select', '0')
                 select = '' if select == '0' else select

route/edit.py

@@ -153,8 +153,6 @@ def edit(name = 'Test', section = 0, do_type = ''):
         if edit_repeat == 'post':
             if captcha_post(conn, flask.request.form.get('g-recaptcha-response', flask.request.form.get('g-recaptcha', ''))) == 1:
                 return re_error(conn, '/error/13')
-            else:
-                captcha_post(conn, '', 0)
     
             if do_edit_slow_check(conn) == 1:
                 return re_error(conn, '/error/24')

route/edit_delete.py

@@ -15,8 +15,6 @@ def edit_delete(name):
         if flask.request.method == 'POST':
             if captcha_post(conn, flask.request.form.get('g-recaptcha-response', flask.request.form.get('g-recaptcha', ''))) == 1:
                 return re_error(conn, '/error/13')
-            else:
-                captcha_post(conn, '', 0)
 
             if do_edit_slow_check(conn) == 1:
                 return re_error(conn, '/error/24')

route/edit_move.py

@@ -17,8 +17,6 @@ def edit_move(name):
 
             if captcha_post(conn, flask.request.form.get('g-recaptcha-response', flask.request.form.get('g-recaptcha', ''))) == 1:
                 return re_error(conn, '/error/13')
-            else:
-                captcha_post(conn, '', 0)
 
             if do_edit_slow_check(conn) == 1:
                 return re_error(conn, '/error/24')

route/edit_revert.py

@@ -19,8 +19,6 @@ def edit_revert(name, num):
         if flask.request.method == 'POST':
             if captcha_post(conn, flask.request.form.get('g-recaptcha-response', flask.request.form.get('g-recaptcha', ''))) == 1:
                 return re_error(conn, '/error/13')
-            else:
-                captcha_post(conn, '', 0)
 
             if do_edit_slow_check(conn) == 1:
                 return re_error(conn, '/error/24')

route/edit_upload.py

@@ -15,8 +15,6 @@ def edit_upload():
         if flask.request.method == 'POST':
             if captcha_post(conn, flask.request.form.get('g-recaptcha-response', flask.request.form.get('g-recaptcha', ''))) == 1:
                 return re_error(conn, '/error/13')
-            else:
-                captcha_post(conn, '', 0)
 
             file_data = flask.request.files.getlist("f_data[]")
             file_len = len(file_data)

route/login_find_key.py

@@ -6,8 +6,6 @@ def login_find_key():
         if flask.request.method == 'POST':
             if captcha_post(conn, flask.request.form.get('g-recaptcha-response', flask.request.form.get('g-recaptcha', ''))) == 1:
                 return re_error(conn, '/error/13')
-            else:
-                captcha_post(conn, '', 0)
             
             input_key = flask.request.form.get('key', '')
             curs.execute(db_change('select id from user_set where name = "random_key" and data = ?'), [input_key])

route/login_login.py

@@ -12,13 +12,8 @@ def login_login_2():
             return re_error(conn, '/ban')
 
         if flask.request.method == 'POST':
-            if 'login_count' in flask.session:
-                count = int(number_check(flask.session['login_count']))
-                if count > 3:
-                    if captcha_post(conn, flask.request.form.get('g-recaptcha-response', flask.request.form.get('g-recaptcha', ''))) == 1:
-                        return re_error(conn, '/error/13')
-                    else:
-                        captcha_post(conn, '', 0)
+            if captcha_post(conn, flask.request.form.get('g-recaptcha-response', flask.request.form.get('g-recaptcha', ''))) == 1:
+                return re_error(conn, '/error/13')
 
             user_agent = flask.request.headers.get('User-Agent', '')
             user_id = flask.request.form.get('id', '')
@@ -39,11 +34,6 @@ def login_login_2():
                 db_user_encode = db_data[0][0]
 
             if pw_check(conn, user_pw, db_user_pw, db_user_encode, user_id) != 1:
-                if not 'login_count' in flask.session:
-                    flask.session['login_count'] = 1
-                else:
-                    flask.session['login_count'] = int(number_check(flask.session['login_count'])) + 1
-
                 return re_error(conn, '/error/10')
 
             curs.execute(db_change('select data from user_set where name = "2fa" and id = ?'), [user_id])
@@ -59,12 +49,6 @@ def login_login_2():
 
                 return redirect(conn, '/user')
         else:
-            captcha_data = ''
-            if 'login_count' in flask.session:
-                count = int(number_check(flask.session['login_count']))
-                if count > 3:
-                    captcha_data = captcha_get(conn)
-
             return easy_minify(conn, flask.render_template(skin_check(conn),
                 imp = [get_lang(conn, 'login'), wiki_set(conn), wiki_custom(conn), wiki_css([0, 0])],
                 data =  '''
@@ -75,7 +59,7 @@ def login_login_2():
                             <hr class="main_hr">
                             <!-- <input type="checkbox" name="auto_login"> ''' + get_lang(conn, 'auto_login') + ''' (''' + get_lang(conn, 'not_working') + ''')
                             <hr class="main_hr"> -->
-                            ''' + captcha_data + '''
+                            ''' + captcha_get(conn) + '''
                             <button type="submit">''' + get_lang(conn, 'login') + '''</button>
                             ''' + http_warning(conn) + '''
                         </form>

route/login_login_2fa.py

@@ -20,8 +20,6 @@ def login_login_2fa_2():
         if flask.request.method == 'POST':
             if captcha_post(conn, flask.request.form.get('g-recaptcha-response', flask.request.form.get('g-recaptcha', ''))) == 1:
                 return re_error(conn, '/error/13')
-            else:
-                captcha_post(conn, '', 0)
 
             user_agent = flask.request.headers.get('User-Agent', '')
             user_id = flask.session['login_id']

route/login_login_2fa_email.py

@@ -20,8 +20,6 @@ def login_login_2fa_email_2():
         if flask.request.method == 'POST':
             if captcha_post(conn, flask.request.form.get('g-recaptcha-response', flask.request.form.get('g-recaptcha', ''))) == 1:
                 return re_error(conn, '/error/13')
-            else:
-                captcha_post(conn, '', 0)
 
             user_agent = flask.request.headers.get('User-Agent', '')
             user_id = flask.session['b_id']

route/login_register.py

@@ -22,8 +22,6 @@ def login_register_2():
             # 리캡차
             if captcha_post(conn, flask.request.form.get('g-recaptcha-response', flask.request.form.get('g-recaptcha', ''))) == 1:
                 return re_error(conn, '/error/13')
-            else:
-                captcha_post(conn, '', 0)
 
             user_id = flask.request.form.get('id', '')
             user_pw = flask.request.form.get('pw', '')

route/tool/func.py

@@ -1782,12 +1782,10 @@ def captcha_get(conn):
 
     return data
 
-def captcha_post(conn, re_data, num = 1):
+def captcha_post(conn, re_data):
     curs = conn.cursor()
 
-    if num != 1:
-        pass
-    elif acl_check('', 'recaptcha_five_pass') == 0 and 'recapcha_pass' in flask.session and flask.session['recapcha_pass'] > 0:
+    if acl_check('', 'recaptcha_five_pass') == 0 and 'recapcha_pass' in flask.session and flask.session['recapcha_pass'] > 0:
         pass
     elif acl_check('', 'recaptcha') == 1:
         curs.execute(db_change('select data from other where name = "sec_re"'))
@@ -1827,14 +1825,13 @@ def captcha_post(conn, re_data, num = 1):
                 if json_data['success'] != True:
                     return 1
 
-    if num == 1:
-        if 'recapcha_pass' in flask.session:
-            if flask.session['recapcha_pass'] > 0:
-                flask.session['recapcha_pass'] -= 1
-            else:
-                flask.session['recapcha_pass'] = 5
+    if 'recapcha_pass' in flask.session:
+        if flask.session['recapcha_pass'] > 0:
+            flask.session['recapcha_pass'] -= 1
         else:
             flask.session['recapcha_pass'] = 5
+    else:
+        flask.session['recapcha_pass'] = 5
 
     return 0
 

route/topic.py

@@ -64,8 +64,6 @@ def topic(topic_num = 0, do_type = '', doc_name = 'Test'):
 
             if captcha_post(conn, flask.request.form.get('g-recaptcha-response', flask.request.form.get('g-recaptcha', ''))) == 1:
                 return re_error(conn, '/error/13')
-            else:
-                captcha_post(conn, '', 0)
 
             today = get_time()