bcypt 완전 삭제, 일부 CSS 조정

app.py

@@ -224,9 +224,7 @@ app = flask.Flask(__name__, template_folder = './')
 app.config['JSON_AS_ASCII'] = False
 
 flask_reggie.Reggie(app)
-
-compress = flask_compress.Compress()
-compress.init_app(app)
+flask_compress.Compress().init_app(app)
 
 class EverythingConverter(werkzeug.routing.PathConverter):
     regex = '.*?'

requirements.txt

@@ -1,5 +1,4 @@
 tornado
-bcrypt
 flask
 flask-Reggie
 flask-compress

route/tool/func.py

@@ -18,7 +18,6 @@ for i in range(0, 2):
         import pymysql
         import hashlib
         import smtplib
-        import bcrypt
         import zipfile
         import shutil
         import threading
@@ -236,18 +235,11 @@ def pw_encode(data, data2 = '', type_d = ''):
 
     if type_d == 'sha256':
         return hashlib.sha256(bytes(data, 'utf-8')).hexdigest()
-    elif type_d == 'sha3':
+    else:
         if sys.version_info < (3, 6):
             return sha3.sha3_256(bytes(data, 'utf-8')).hexdigest()
         else:
             return hashlib.sha3_256(bytes(data, 'utf-8')).hexdigest()
-    else:
-        if data2 != '':
-            salt_data = bytes(data2, 'utf-8')
-        else:
-            salt_data = bcrypt.gensalt(11)
-
-        return bcrypt.hashpw(bytes(data, 'utf-8'), salt_data).decode()
 
 def pw_check(data, data2, type_d = 'no', id_d = ''):
     curs.execute(db_change('select data from other where name = "encode"'))
@@ -255,31 +247,16 @@ def pw_check(data, data2, type_d = 'no', id_d = ''):
 
     if type_d != 'no':
         if type_d == '':
-            set_data = 'bcrypt'
+            set_data = 'sha3'
         else:
             set_data = type_d
     else:
         set_data = db_data[0][0]
 
-    while 1:
-        if set_data in ['sha256', 'sha3']:
-            data3 = pw_encode(data = data, type_d = set_data)
-            if data3 == data2:
-                re_data = 1
-            else:
-                re_data = 0
-
-            break
-        else:
-            try:
-                if pw_encode(data, data2, 'bcrypt') == data2:
-                    re_data = 1
-                else:
-                    re_data = 0
-
-                break
-            except:
-                set_data = db_data[0][0]
+    if pw_encode(data = data, type_d = set_data) == data2:
+        re_data = 1
+    else:
+        re_data = 0
 
     if db_data[0][0] != set_data and re_data == 1 and id_d != '':
         curs.execute(db_change("update user set pw = ?, encode = ? where id = ?"), [pw_encode(data), db_data[0][0], id_d])

version.json

@@ -1,6 +1,6 @@
 {
     "master" : {
-        "r_ver" : "v3.1.8-master-22",
+        "r_ver" : "v3.1.8-master-23",
         "c_ver" : "3182000",
         "s_ver" : "8"
     }, "stable" : {

views/marisa/css/main.css

@@ -1,11 +1,9 @@
-@import url(https://fonts.googleapis.com/earlyaccess/nanumgothic.css);
-
 body {
     max-width: 100%;
     word-break: break-all;
     word-wrap: break-word;
     margin: 0;
-    font-family: "나눔고딕", "Nanum Gothic", sans-serif;
+    font-family: 'Apple SD Gothic', '맑은고딕', 'Nanum Gothic', 'Noto Sans KR', sans-serif;
     font-size: 14px;
 }
 
@@ -314,7 +312,6 @@ pre, #toc, #cate, #redirect {
 
 textarea, input {
     border: 1px solid #aaa;
-    font-family: '나눔고딕', 'Nanum Gothic', 'Noto Sans KR', 'Malgun Gothic', '맑은 고딕', sans-serif;
     padding: 5px;
     margin-left: -5px;
 }

views/marisa/index.html

@@ -8,7 +8,7 @@
             <title>{{imp[0]}} - {{imp[1][0]}}</title>
         {% endif %}
         {{imp[3][3]|safe}}
-        <link rel="stylesheet" href="/views/marisa/css/main.css?ver=10">
+        <link rel="stylesheet" href="/views/marisa/css/main.css?ver=11">
         <script src="/views/marisa/js/skin_set.js?ver=4"></script>
         <script src="/views/marisa/js/main.js?ver=3"></script>
         <script>main_load(); window.addEventListener('DOMContentLoaded', function() { skin_set(); });</script>

views/marisa/info.json

@@ -1,5 +1,5 @@
 {
     "name" : "Marisa",
-    "skin_ver" : "v1.2.2",
+    "skin_ver" : "v1.2.3",
     "require_ver" : "8"
 }