그냥 2개 더 분리

app.py

@@ -450,277 +450,11 @@ def close_topic_list(name = None, tool = None):
             
 @app.route('/login', methods=['POST', 'GET'])
 def login():
-    if custom()[2] != 0:
-        return redirect('/user')
-    
-    if ban_check(tool = 'login') == 1:
-        return re_error('/ban')
-        
-    if flask.request.method == 'POST':        
-        if captcha_post(flask.request.form.get('g-recaptcha-response', '')) == 1:
-            return re_error('/error/13')
-        else:
-            captcha_post('', 0)
-
-        ip = ip_check()
-        agent = flask.request.headers.get('User-Agent')
-
-        curs.execute("select pw, encode from user where id = ?", [flask.request.form.get('id', None)])
-        user = curs.fetchall()
-        if not user:
-            return re_error('/error/2')
-
-        pw_check_d = pw_check(
-            flask.request.form.get('pw', ''), 
-            user[0][0],
-            user[0][1],
-            flask.request.form.get('id', None)
-        )
-        if pw_check_d != 1:
-            return re_error('/error/10')
-
-        flask.session['state'] = 1
-        flask.session['id'] = flask.request.form.get('id', None)
-        
-        curs.execute("select css from custom where user = ?", [flask.request.form.get('id', None)])
-        css_data = curs.fetchall()
-        if css_data:
-            flask.session['head'] = css_data[0][0]
-        else:
-            flask.session['head'] = ''
-
-        curs.execute("insert into ua_d (name, ip, ua, today, sub) values (?, ?, ?, ?, '')", [flask.request.form.get('id', None), ip_check(1), agent, get_time()])
-
-        conn.commit()
-        
-        return redirect('/user')  
-    else:
-        oauth_content = '<link rel="stylesheet" href="/views/main_css/oauth.css"><div class="oauth-wrapper"><ul class="oauth-list">'
-        oauth_supported = load_oauth('_README')['support']
-        for i in range(len(oauth_supported)):
-            oauth_data = load_oauth(oauth_supported[i])
-            if oauth_data['client_id'] != '' and oauth_data['client_secret'] != '':
-                oauth_content +=    '''
-                                    <li>
-                                        <a href="/oauth/{}/init">
-                                            <div class="oauth-btn oauth-btn-{}">
-                                                <div class="oauth-btn-logo oauth-btn-{}"></div>
-                                                {}
-                                            </div>
-                                        </a>
-                                    </li>
-                                    '''.format(
-                                        oauth_supported[i], 
-                                        oauth_supported[i], 
-                                        oauth_supported[i], 
-                                        load_lang('oauth_signin_' + oauth_supported[i])
-                                    )
-        
-        oauth_content += '</ul></div>'
-        
-        return easy_minify(flask.render_template(skin_check(),    
-            imp = [load_lang('login'), wiki_set(), custom(), other2([0, 0])],
-            data =  '''
-                    <form method="post">
-                        <input placeholder="''' + load_lang('id') + '''" name="id" type="text">
-                        <hr class=\"main_hr\">
-                        <input placeholder="''' + load_lang('password') + '''" name="pw" type="password">
-                        <hr class=\"main_hr\">
-                        ''' + captcha_get() + '''
-                        <button type="submit">''' + load_lang('login') + '''</button>
-                        <hr class=\"main_hr\">
-                        ''' + oauth_content + '''
-                        <hr class=\"main_hr\">
-                        <span>''' + load_lang('http_warring') + '''</span>
-                    </form>
-                    ''',
-            menu = [['user', load_lang('return')]]
-        ))
+    return login_2(conn)
 
 @app.route('/oauth/<regex("discord|naver|facebook"):platform>/<regex("init|callback"):func>', methods=['GET', 'POST'])
 def login_oauth(platform = None, func = None):
-    publish_url = load_oauth('publish_url')
-    oauth_data = load_oauth(platform)
-    api_url = {}
-    data = {
-        'client_id' : oauth_data['client_id'],
-        'client_secret' : oauth_data['client_secret'],
-        'redirect_uri' : publish_url + '/oauth/' + platform + '/callback',
-        'state' : 'RAMDOMVALUE'
-    }
-
-    if platform == 'discord':
-        api_url['redirect'] = 'https://discordapp.com/api/oauth2/authorize'
-        api_url['token'] = 'https://discordapp.com/api/oauth2/token'
-        api_url['profile'] = 'https://discordapp.com/api/users/@me'
-    elif platform == 'naver':
-        api_url['redirect'] = 'https://nid.naver.com/oauth2.0/authorize'
-        api_url['token'] = 'https://nid.naver.com/oauth2.0/token'
-        api_url['profile'] = 'https://openapi.naver.com/v1/nid/me'
-    elif platform == 'facebook':
-        api_url['redirect'] = 'https://www.facebook.com/v3.1/dialog/oauth'
-        api_url['token'] = 'https://graph.facebook.com/v3.1/oauth/access_token'
-        api_url['profile'] = 'https://graph.facebook.com/me'
-
-    if func == 'init':
-        if oauth_data['client_id'] == '' or oauth_data['client_secret'] == '':
-            return easy_minify(flask.render_template(skin_check(), 
-                imp = [load_lang('error'), wiki_set(), custom(), other2([0, 0])], 
-                data = load_lang('oauth_disabled'), 
-                menu = [['user', load_lang('return')]]
-            ))
-        elif publish_url == 'https://':
-            return easy_minify(flask.render_template(skin_check(), 
-                imp = [load_lang('error'), wiki_set(), custom(), other2([0, 0])], 
-                data = load_lang('oauth_setting_not_found'), 
-                menu = [['user', load_lang('return')]]
-            ))
-
-        referrer_re = re.compile(r'(?P<host>^(https?):\/\/([^\/]+))\/(?P<refer>[^\/?]+)')
-        if flask.request.referrer != None:
-            referrer = referrer_re.search(flask.request.referrer)
-            if referrer.group('host') != load_oauth('publish_url'):
-                return redirect()
-            else:
-                flask.session['referrer'] = referrer.group('refer')
-        else:
-            return redirect()
-
-        flask.session['refer'] = flask.request.referrer
-
-        if platform == 'discord':
-            return redirect(api_url['redirect'] + '?client_id={}&redirect_uri={}&response_type=code&scope=identify'.format(
-                data['client_id'], 
-                data['redirect_uri']
-            ))
-        elif platform == 'naver':
-            return redirect(api_url['redirect'] + '?response_type=code&client_id={}&redirect_uri={}&state={}'.format(
-                data['client_id'], 
-                data['redirect_uri'], 
-                data['state']
-            ))
-        elif platform == 'facebook':
-            return redirect(api_url['redirect'] + '?client_id={}&redirect_uri={}&state={}'.format(
-                data['client_id'], 
-                data['redirect_uri'], 
-                data['state']
-            ))
-
-    elif func == 'callback':
-        code = flask.request.args.get('code')
-        state = flask.request.args.get('state')
-
-        if code == None:
-            return easy_minify(flask.render_template(skin_check(),
-                imp = [load_lang('inter_error'), wiki_set(), custom(), other2([0, 0])],
-                data = '<h2>ie_wrong_callback</h2>' + load_lang('ie_wrong_callback'),
-                menu = [['user', load_lang('return')]]
-            ))
-
-        if platform == 'discord':
-            data = {
-                'client_id'     : data['client_id'],
-                'client_secret' : data['client_secret'],
-                'grant_type'    : 'authorization_code',
-                'redirect_uri'  : data['redirect_uri'],
-                'scope'         : 'identify',
-                'code'          : code
-            }
-            headers = {
-                'Content-Type': 'application/x-www-form-urlencoded',
-                'User-Agent': 'Mozilla/5.0'
-            }
-            token_exchange = urllib.request.Request(
-                'https://discordapp.com/api/oauth2/token',
-                data = bytes(urllib.parse.urlencode(data).encode()),
-                headers = headers
-            )
-            token_result = urllib.request.urlopen(token_exchange).read()
-            token_json = json.loads(token_result)
-
-            headers = {
-                'User-Agent'    : 'Mozilla/5.0',
-                'Authorization' : 'Bearer ' + token_json['access_token']
-            }
-            profile_exchange = urllib.request.Request(
-                'https://discordapp.com/api/users/@me',
-                headers = headers
-            )
-            profile_result =  urllib.request.urlopen(profile_exchange).read().decode('utf-8')
-            profile_result_json = json.loads(profile_result)
-            stand_json = {
-                'id'        : profile_result_json['id'], 
-                'name'      : profile_result_json['username'] + '#' + profile_result_json['discriminator'],
-                'picture'   : profile_result_json['avatar']
-            }
-        elif platform == 'naver':
-            token_access = api_url['token'] + '?grant_type=authorization_code&client_id={}&client_secret={}&code={}&state={}'.format(
-                data['client_id'], 
-                data['client_secret'], 
-                code, 
-                state
-            )
-            token_result = urllib.request.urlopen(token_access).read().decode('utf-8')
-            token_result_json = json.loads(token_result)
-
-            headers = {
-                'Authorization': 'Bearer {}'.format(token_result_json['access_token'])
-            }
-
-            profile_access = urllib.request.Request(api_url['profile'], headers = headers)
-            profile_result = urllib.request.urlopen(profile_access).read().decode('utf-8')
-            profile_result_json = json.loads(profile_result)
-
-            stand_json = {
-                'id'        : profile_result_json['response']['id'],
-                'name'      : profile_result_json['response']['name'],
-                'picture'   : profile_result_json['response']['profile_image']
-            }
-        elif platform == 'facebook':
-            token_access = api_url['token'] + '?client_id={}&redirect_uri={}&client_secret={}&code={}'.format(
-                data['client_id'], 
-                data['redirect_uri'], 
-                data['client_secret'], 
-                code
-            )
-            token_result = urllib.request.urlopen(token_access).read().decode('utf-8')
-            token_result_json = json.loads(token_result)
-
-            profile_access = api_url['profile'] + '?fields=id,name,picture&access_token={}'.format(token_result_json['access_token'])
-            profile_result = urllib.request.urlopen(profile_access).read().decode('utf-8')
-            profile_result_json = json.loads(profile_result)
-
-            stand_json = {
-                'id': profile_result_json['id'], 
-                'name': profile_result_json['name'], 
-                'picture': profile_result_json['picture']['data']['url']
-            }
-        
-        if flask.session['referrer'][0:6] == 'change':
-            curs.execute('select * from oauth_conn where wiki_id = ? and provider = ?', [flask.session['id'], platform])
-            oauth_result = curs.fetchall()
-            if len(oauth_result) == 0:
-                curs.execute('insert into oauth_conn (provider, wiki_id, sns_id, name, picture) values(?, ?, ?, ?, ?)', [
-                    platform, 
-                    flask.session['id'], 
-                    stand_json['id'], 
-                    stand_json['name'], 
-                    stand_json['picture']
-                ])
-            else:
-                curs.execute('update oauth_conn set name = ? picture = ? where wiki_id = ?', [stand_json['name'], stand_json['pricture'], flask.session['id']])
-
-            conn.commit()
-        elif flask.session['referrer'][0:5] == 'login':
-            curs.execute('select * from oauth_conn where provider = ? and sns_id = ?', [platform, stand_json['id']])
-            curs_result = curs.fetchall()
-            if len(curs_result) == 0:
-                return re_error('/error/2')
-            else:
-                flask.session['state'] = 1
-                flask.session['id'] = curs_result[0][2]
-        
-        return redirect(flask.session['refer'])
+    return login_oauth_2(conn, platform, func)
                 
 @app.route('/change', methods=['POST', 'GET'])
 def change_password():

route/login.py

@@ -0,0 +1,91 @@
+from .tool.func import *
+
+def login_2(conn):
+    curs = conn.cursor()
+
+    if custom()[2] != 0:
+        return redirect('/user')
+    
+    if ban_check(tool = 'login') == 1:
+        return re_error('/ban')
+        
+    if flask.request.method == 'POST':        
+        if captcha_post(flask.request.form.get('g-recaptcha-response', '')) == 1:
+            return re_error('/error/13')
+        else:
+            captcha_post('', 0)
+
+        ip = ip_check()
+        agent = flask.request.headers.get('User-Agent')
+
+        curs.execute("select pw, encode from user where id = ?", [flask.request.form.get('id', None)])
+        user = curs.fetchall()
+        if not user:
+            return re_error('/error/2')
+
+        pw_check_d = pw_check(
+            flask.request.form.get('pw', ''), 
+            user[0][0],
+            user[0][1],
+            flask.request.form.get('id', None)
+        )
+        if pw_check_d != 1:
+            return re_error('/error/10')
+
+        flask.session['state'] = 1
+        flask.session['id'] = flask.request.form.get('id', None)
+        
+        curs.execute("select css from custom where user = ?", [flask.request.form.get('id', None)])
+        css_data = curs.fetchall()
+        if css_data:
+            flask.session['head'] = css_data[0][0]
+        else:
+            flask.session['head'] = ''
+
+        curs.execute("insert into ua_d (name, ip, ua, today, sub) values (?, ?, ?, ?, '')", [flask.request.form.get('id', None), ip_check(1), agent, get_time()])
+
+        conn.commit()
+        
+        return redirect('/user')  
+    else:
+        oauth_content = '<link rel="stylesheet" href="/views/main_css/oauth.css"><div class="oauth-wrapper"><ul class="oauth-list">'
+        oauth_supported = load_oauth('_README')['support']
+        for i in range(len(oauth_supported)):
+            oauth_data = load_oauth(oauth_supported[i])
+            if oauth_data['client_id'] != '' and oauth_data['client_secret'] != '':
+                oauth_content +=    '''
+                                    <li>
+                                        <a href="/oauth/{}/init">
+                                            <div class="oauth-btn oauth-btn-{}">
+                                                <div class="oauth-btn-logo oauth-btn-{}"></div>
+                                                {}
+                                            </div>
+                                        </a>
+                                    </li>
+                                    '''.format(
+                                        oauth_supported[i], 
+                                        oauth_supported[i], 
+                                        oauth_supported[i], 
+                                        load_lang('oauth_signin_' + oauth_supported[i])
+                                    )
+        
+        oauth_content += '</ul></div>'
+        
+        return easy_minify(flask.render_template(skin_check(),    
+            imp = [load_lang('login'), wiki_set(), custom(), other2([0, 0])],
+            data =  '''
+                    <form method="post">
+                        <input placeholder="''' + load_lang('id') + '''" name="id" type="text">
+                        <hr class=\"main_hr\">
+                        <input placeholder="''' + load_lang('password') + '''" name="pw" type="password">
+                        <hr class=\"main_hr\">
+                        ''' + captcha_get() + '''
+                        <button type="submit">''' + load_lang('login') + '''</button>
+                        <hr class=\"main_hr\">
+                        ''' + oauth_content + '''
+                        <hr class=\"main_hr\">
+                        <span>''' + load_lang('http_warring') + '''</span>
+                    </form>
+                    ''',
+            menu = [['user', load_lang('return')]]
+        ))

route/login_oauth.py

@@ -0,0 +1,187 @@
+from .tool.func import *
+
+def login_oauth_2(conn, platform, func):
+    curs = conn.cursor()
+
+    publish_url = load_oauth('publish_url')
+    oauth_data = load_oauth(platform)
+    api_url = {}
+    data = {
+        'client_id' : oauth_data['client_id'],
+        'client_secret' : oauth_data['client_secret'],
+        'redirect_uri' : publish_url + '/oauth/' + platform + '/callback',
+        'state' : 'RAMDOMVALUE'
+    }
+
+    if platform == 'discord':
+        api_url['redirect'] = 'https://discordapp.com/api/oauth2/authorize'
+        api_url['token'] = 'https://discordapp.com/api/oauth2/token'
+        api_url['profile'] = 'https://discordapp.com/api/users/@me'
+    elif platform == 'naver':
+        api_url['redirect'] = 'https://nid.naver.com/oauth2.0/authorize'
+        api_url['token'] = 'https://nid.naver.com/oauth2.0/token'
+        api_url['profile'] = 'https://openapi.naver.com/v1/nid/me'
+    elif platform == 'facebook':
+        api_url['redirect'] = 'https://www.facebook.com/v3.1/dialog/oauth'
+        api_url['token'] = 'https://graph.facebook.com/v3.1/oauth/access_token'
+        api_url['profile'] = 'https://graph.facebook.com/me'
+
+    if func == 'init':
+        if oauth_data['client_id'] == '' or oauth_data['client_secret'] == '':
+            return easy_minify(flask.render_template(skin_check(), 
+                imp = [load_lang('error'), wiki_set(), custom(), other2([0, 0])], 
+                data = load_lang('oauth_disabled'), 
+                menu = [['user', load_lang('return')]]
+            ))
+        elif publish_url == 'https://':
+            return easy_minify(flask.render_template(skin_check(), 
+                imp = [load_lang('error'), wiki_set(), custom(), other2([0, 0])], 
+                data = load_lang('oauth_setting_not_found'), 
+                menu = [['user', load_lang('return')]]
+            ))
+
+        referrer_re = re.compile(r'(?P<host>^(https?):\/\/([^\/]+))\/(?P<refer>[^\/?]+)')
+        if flask.request.referrer != None:
+            referrer = referrer_re.search(flask.request.referrer)
+            if referrer.group('host') != load_oauth('publish_url'):
+                return redirect()
+            else:
+                flask.session['referrer'] = referrer.group('refer')
+        else:
+            return redirect()
+
+        flask.session['refer'] = flask.request.referrer
+
+        if platform == 'discord':
+            return redirect(api_url['redirect'] + '?client_id={}&redirect_uri={}&response_type=code&scope=identify'.format(
+                data['client_id'], 
+                data['redirect_uri']
+            ))
+        elif platform == 'naver':
+            return redirect(api_url['redirect'] + '?response_type=code&client_id={}&redirect_uri={}&state={}'.format(
+                data['client_id'], 
+                data['redirect_uri'], 
+                data['state']
+            ))
+        elif platform == 'facebook':
+            return redirect(api_url['redirect'] + '?client_id={}&redirect_uri={}&state={}'.format(
+                data['client_id'], 
+                data['redirect_uri'], 
+                data['state']
+            ))
+
+    elif func == 'callback':
+        code = flask.request.args.get('code')
+        state = flask.request.args.get('state')
+
+        if code == None:
+            return easy_minify(flask.render_template(skin_check(),
+                imp = [load_lang('inter_error'), wiki_set(), custom(), other2([0, 0])],
+                data = '<h2>ie_wrong_callback</h2>' + load_lang('ie_wrong_callback'),
+                menu = [['user', load_lang('return')]]
+            ))
+
+        if platform == 'discord':
+            data = {
+                'client_id'     : data['client_id'],
+                'client_secret' : data['client_secret'],
+                'grant_type'    : 'authorization_code',
+                'redirect_uri'  : data['redirect_uri'],
+                'scope'         : 'identify',
+                'code'          : code
+            }
+            headers = {
+                'Content-Type': 'application/x-www-form-urlencoded',
+                'User-Agent': 'Mozilla/5.0'
+            }
+            token_exchange = urllib.request.Request(
+                'https://discordapp.com/api/oauth2/token',
+                data = bytes(urllib.parse.urlencode(data).encode()),
+                headers = headers
+            )
+            token_result = urllib.request.urlopen(token_exchange).read()
+            token_json = json.loads(token_result)
+
+            headers = {
+                'User-Agent'    : 'Mozilla/5.0',
+                'Authorization' : 'Bearer ' + token_json['access_token']
+            }
+            profile_exchange = urllib.request.Request(
+                'https://discordapp.com/api/users/@me',
+                headers = headers
+            )
+            profile_result =  urllib.request.urlopen(profile_exchange).read().decode('utf-8')
+            profile_result_json = json.loads(profile_result)
+            stand_json = {
+                'id'        : profile_result_json['id'], 
+                'name'      : profile_result_json['username'] + '#' + profile_result_json['discriminator'],
+                'picture'   : profile_result_json['avatar']
+            }
+        elif platform == 'naver':
+            token_access = api_url['token'] + '?grant_type=authorization_code&client_id={}&client_secret={}&code={}&state={}'.format(
+                data['client_id'], 
+                data['client_secret'], 
+                code, 
+                state
+            )
+            token_result = urllib.request.urlopen(token_access).read().decode('utf-8')
+            token_result_json = json.loads(token_result)
+
+            headers = {
+                'Authorization': 'Bearer {}'.format(token_result_json['access_token'])
+            }
+
+            profile_access = urllib.request.Request(api_url['profile'], headers = headers)
+            profile_result = urllib.request.urlopen(profile_access).read().decode('utf-8')
+            profile_result_json = json.loads(profile_result)
+
+            stand_json = {
+                'id'        : profile_result_json['response']['id'],
+                'name'      : profile_result_json['response']['name'],
+                'picture'   : profile_result_json['response']['profile_image']
+            }
+        elif platform == 'facebook':
+            token_access = api_url['token'] + '?client_id={}&redirect_uri={}&client_secret={}&code={}'.format(
+                data['client_id'], 
+                data['redirect_uri'], 
+                data['client_secret'], 
+                code
+            )
+            token_result = urllib.request.urlopen(token_access).read().decode('utf-8')
+            token_result_json = json.loads(token_result)
+
+            profile_access = api_url['profile'] + '?fields=id,name,picture&access_token={}'.format(token_result_json['access_token'])
+            profile_result = urllib.request.urlopen(profile_access).read().decode('utf-8')
+            profile_result_json = json.loads(profile_result)
+
+            stand_json = {
+                'id': profile_result_json['id'], 
+                'name': profile_result_json['name'], 
+                'picture': profile_result_json['picture']['data']['url']
+            }
+        
+        if flask.session['referrer'][0:6] == 'change':
+            curs.execute('select * from oauth_conn where wiki_id = ? and provider = ?', [flask.session['id'], platform])
+            oauth_result = curs.fetchall()
+            if len(oauth_result) == 0:
+                curs.execute('insert into oauth_conn (provider, wiki_id, sns_id, name, picture) values(?, ?, ?, ?, ?)', [
+                    platform, 
+                    flask.session['id'], 
+                    stand_json['id'], 
+                    stand_json['name'], 
+                    stand_json['picture']
+                ])
+            else:
+                curs.execute('update oauth_conn set name = ? picture = ? where wiki_id = ?', [stand_json['name'], stand_json['pricture'], flask.session['id']])
+
+            conn.commit()
+        elif flask.session['referrer'][0:5] == 'login':
+            curs.execute('select * from oauth_conn where provider = ? and sns_id = ?', [platform, stand_json['id']])
+            curs_result = curs.fetchall()
+            if len(curs_result) == 0:
+                return re_error('/error/2')
+            else:
+                flask.session['state'] = 1
+                flask.session['id'] = curs_result[0][2]
+        
+        return redirect(flask.session['refer'])