new file: app/test/test_bug#_lijie.py.py

修改源代码的 account_service.py 文件，并加入验证码机制。

app/account_service.py

@@ -1,10 +1,10 @@
 from flask import *
 from Login import check_username_availability, verify_user, add_user, get_expiry_date, change_password, WarningMessage
 
-
 # 初始化蓝图
 accountService = Blueprint("accountService", __name__)
 
+
 ### Sign-up, login, logout ###
 @accountService.route("/signup", methods=['GET', 'POST'])
 def signup():
@@ -19,16 +19,44 @@ def signup():
         # POST方法需判断是否注册成功，再根据结果返回不同的内容
         username = escape(request.form['username'])
         password = escape(request.form['password'])
-        
+
-        #! 添加如下代码为了过滤注册时的非法字符
+        # ! 添加如下代码为了过滤注册时的非法字符
         warn = WarningMessage(username)
         if str(warn) != 'OK':
-            return jsonify({'status': '3', 'warn': str(warn)})
+            return str(warn)
-        
+            # return jsonify({'status': '3', 'warn': str(warn)})
+
         available = check_username_availability(username)
-        if not available: # 用户名不可用
+        if not available:  # 用户名不可用
-            return jsonify({'status': '0'})
+            flash('用户名 %s 已经被注册。' % (username))
-        else: # 添加账户信息
+            return render_template('signup.html')
+        elif len(password.strip()) < 8:  # 密码过短
+            return '密码少于8位。'
+            # return jsonify({'status': '0'})
+
+        has_specialchar = False
+        specialchar_list = ['+', '-', '*', '/', '_', '&', '%', ',']
+        for c in password.strip():
+            if c in specialchar_list:
+                has_specialchar = True
+                break
+        if not has_specialchar:
+            return '密码必须包含特殊字符'
+
+        has_upper_letter = False
+        has_lower_letter = False
+        for c in password.strip():
+            if c.isupper():
+                has_upper_letter = True
+            elif c.islower():
+                has_lower_letter = True
+            has_both_letter = has_upper_letter and has_lower_letter
+            if has_both_letter:
+                break
+        if not has_both_letter:
+            return '密码必须同时包含大写字母和小写字母'
+
+        else:  # 添加账户信息
             add_user(username, password)
             verified = verify_user(username, password)
             if verified:
@@ -43,7 +71,6 @@ def signup():
                 return jsonify({'status': '1'})
 
 
-
 @accountService.route("/login", methods=['GET', 'POST'])
 def login():
     '''
@@ -102,9 +129,9 @@ def reset():
         # POST请求用于提交修改后信息
         old_password = escape(request.form['old-password'])
         new_password = escape(request.form['new-password'])
-        flag = change_password(username, old_password, new_password) # flag表示是否修改成功
+        flag = change_password(username, old_password, new_password)  # flag表示是否修改成功
         if flag:
             session['logged_in'] = False
-            return jsonify({'status':'1'})  # 修改成功
+            return jsonify({'status': '1'})  # 修改成功
         else:
-            return jsonify({'status':'2'})  # 修改失败
+            return jsonify({'status': '2'})  # 修改失败

app/bug.py

@@ -0,0 +1,47 @@
+from random import randint
+from PIL import Image, ImageDraw, ImageFont
+
+
+def get_random_color():
+    # 随机颜色RGB
+    return randint(120, 200), randint(120, 200), randint(120, 200)
+
+
+def get_random_code():
+    # 随机字符
+    codes = [[chr(i) for i in range(48, 58)], [chr(i) for i in range(65, 91)], [chr(i) for i in range(97, 123)]]
+    codes = codes[randint(0, 2)]
+    return codes[randint(0, len(codes)-1)]
+
+
+def generate_captcha(width=140, height=60, length=4):
+    # 生成验证码
+    img = Image.new("RGB", (width, height), (250, 250, 250))
+    draw = ImageDraw.Draw(img)
+    font = ImageFont.truetype("static/font/font.ttf", size=36)
+    # 验证码文本
+    text = ""
+    for i in range(length):
+        c = get_random_code()
+        text += c
+
+        rand_len = randint(-5, 5)
+        draw.text((width * 0.2 * (i+1) + rand_len, height * 0.2 + rand_len), c, font=font, fill=get_random_color())
+    # 加入干扰线
+    for i in range(3):
+        x1 = randint(0, width)
+        y1 = randint(0, height)
+        x2 = randint(0, width)
+        y2 = randint(0, height)
+        draw.line((x1, y1, x2, y2), fill=get_random_color())
+    # 加入干扰点
+    for i in range(16):
+        draw.point((randint(0, width), randint(0, height)), fill=get_random_color())
+    # 保存图片
+    img.save("static/captcha/" + text + ".jpg")
+    return text + ".jpg"
+
+
+if __name__ == "__main__":
+    for i in range(1000):
+        generate_captcha()

app/test/test_bug#_lijie.py.py

@@ -0,0 +1 @@
+# Just a python_file for homework, do nothing

test_vocabulary.py

@@ -1,94 +0,0 @@
-# Run this test script on the command line:
-#   pytest test_vocabulary.py
-#
-# Last modified by Mr Lan Hui on 2025-03-05
-
-from vocabulary import UserVocabularyLevel, ArticleVocabularyLevel
-
-
-def test_article_level_empty_content():
-    ''' Boundary case test '''
-    article = ArticleVocabularyLevel('')
-    assert article.level == 0
-
-def test_article_level_punctuation_only():
-    ''' Boundary case test '''
-    article = ArticleVocabularyLevel(',')
-    assert article.level == 0
-
-def test_article_level_digit_only():
-    ''' Boundary case test '''
-    article = ArticleVocabularyLevel('1')
-    assert article.level == 0
-    
-def test_article_level_single_word():
-    ''' Boundary case test '''
-    article = ArticleVocabularyLevel('source')
-    assert 2 <= article.level <= 4
-
-def test_article_level_subset_vs_superset():
-    ''' Boundary case test '''
-    article1 = ArticleVocabularyLevel('source')
-    article2 = ArticleVocabularyLevel('open source')
-    assert article1.level < article2.level
-    
-def test_article_level_multiple_words():
-    ''' Boundary case test '''
-    article = ArticleVocabularyLevel('Producing Open Source Software - How to Run a Successful Free Software Project')
-    assert 3 <= article.level <= 5
-
-def test_article_level_short_paragraph():
-    ''' Boundary case test '''
-    article = ArticleVocabularyLevel('At parties, people no longer give me a blank stare when I tell them I work in open source software. "Oh, yes — like Linux?" they say. I nod eagerly in agreement. "Yes, exactly! That\'s what I do." It\'s nice not to be completely fringe anymore. In the past, the next question was usually fairly predictable: "How do you make money doing that?" To answer, I\'d summarize the economics of free software: that there are organizations in whose interest it is to have certain software exist, but that they don\'t need to sell copies, they just want to make sure the software is available and maintained, as a tool instead of as a rentable monopoly.')
-    assert 4 <= article.level <= 6
-
-def test_article_level_medium_paragraph():
-    ''' Boundary case test '''
-    article = ArticleVocabularyLevel('In considering the Origin of Species, it is quite conceivable that a naturalist, reflecting on the mutual affinities of organic beings, on their embryological relations, their geographical distribution, geological succession, and other such facts, might come to the conclusion that each species had not been independently created, but had descended, like varieties, from other species. Nevertheless, such a conclusion, even if well founded, would be unsatisfactory, until it could be shown how the innumerable species inhabiting this world have been modified, so as to acquire that perfection of structure and coadaptation which most justly excites our admiration. Naturalists continually refer to external conditions, such as climate, food, etc., as the only possible cause of variation. In one very limited sense, as we shall hereafter see, this may be true; but it is preposterous to attribute to mere external conditions, the structure, for instance, of the woodpecker, with its feet, tail, beak, and tongue, so admirably adapted to catch insects under the bark of trees. In the case of the misseltoe, which draws its nourishment from certain trees, which has seeds that must be transported by certain birds, and which has flowers with separate sexes absolutely requiring the agency of certain insects to bring pollen from one flower to the other, it is equally preposterous to account for the structure of this parasite, with its relations to several distinct organic beings, by the effects of external conditions, or of habit, or of the volition of the plant itself.')
-    assert 5 <= article.level <= 7
-    
-def test_article_level_long_paragraph():
-    ''' Boundary case test '''
-    article = ArticleVocabularyLevel('These several facts accord well with my theory. I believe in no fixed law of development, causing all the inhabitants of a country to change abruptly, or simultaneously, or to an equal degree. The process of modification must be extremely slow. The variability of each species is quite independent of that of all others. Whether such variability be taken advantage of by natural selection, and whether the variations be accumulated to a greater or lesser amount, thus causing a greater or lesser amount of modification in the varying species, depends on many complex contingencies,—on the variability being of a beneficial nature, on the power of intercrossing, on the rate of breeding, on the slowly changing physical conditions of the country, and more especially on the nature of the other inhabitants with which the varying species comes into competition. Hence it is by no means surprising that one species should retain the same identical form much longer than others; or, if changing, that it should change less. We see the same fact in geographical distribution; for instance, in the land-shells and coleopterous insects of Madeira having come to differ considerably from their nearest allies on the continent of Europe, whereas the marine shells and birds have remained unaltered. We can perhaps understand the apparently quicker rate of change in terrestrial and in more highly organised productions compared with marine and lower productions, by the more complex relations of the higher beings to their organic and inorganic conditions of life, as explained in a former chapter. When many of the inhabitants of a country have become modified and improved, we can understand, on the principle of competition, and on that of the many all-important relations of organism to organism, that any form which does not become in some degree modified and improved, will be liable to be exterminated. Hence we can see why all the species in the same region do at last, if we look to wide enough intervals of time, become modified; for those which do not change will become extinct.')
-    assert 6 <= article.level <= 8
-    
-def test_user_level_empty_dictionary():
-    ''' Boundary case test '''
-    user = UserVocabularyLevel({})
-    assert user.level == 0
-
-def test_user_level_one_simple_word():
-    ''' Boundary case test '''
-    user = UserVocabularyLevel({'simple':['202408050930']})
-    assert 0 < user.level <= 4
-    
-def test_user_level_invalid_word():
-    ''' Boundary case test '''
-    user = UserVocabularyLevel({'xyz':['202408050930']})
-    assert user.level == 0
- 
-def test_user_level_one_hard_word():
-    ''' Boundary case test '''
-    user = UserVocabularyLevel({'pasture':['202408050930']})
-    assert 5 <= user.level <= 8
- 
-def test_user_level_multiple_words():
-    ''' Boundary case test '''
-    user = UserVocabularyLevel(
-        {'sessile': ['202408050930'], 'putrid': ['202408050930'], 'prodigal': ['202408050930'], 'presumptuous': ['202408050930'], 'prehension': ['202408050930'], 'pied': ['202408050930'], 'pedunculated': ['202408050930'], 'pasture': ['202408050930'], 'parturition': ['202408050930'], 'ovigerous': ['202408050930'], 'ova': ['202408050930'], 'orifice': ['202408050930'], 'obliterate': ['202408050930'], 'niggard': ['202408050930'], 'neuter': ['202408050930'], 'locomotion': ['202408050930'], 'lineal': ['202408050930'], 'glottis': ['202408050930'], 'frivolous': ['202408050930'], 'frena': ['202408050930'], 'flotation': ['202408050930'], 'ductus': ['202408050930'], 'dorsal': ['202408050930'], 'dearth': ['202408050930'], 'crustacean': ['202408050930'], 'cornea': ['202408050930'], 'contrivance': ['202408050930'], 'collateral': ['202408050930'], 'cirriped': ['202408050930'], 'canon': ['202408050930'], 'branchiae': ['202408050930'], 'auditory': ['202408050930'], 'articulata': ['202408050930'], 'alimentary': ['202408050930'], 'adduce': ['202408050930'], 'aberration': ['202408050930']}        
-    )
-    assert 6 <= user.level <= 8
- 
-def test_user_level_consider_only_most_recent_words_difficult_words_most_recent():
-    ''' Consider only the most recent three words '''
-    user = UserVocabularyLevel(
-        {'pasture':['202408050930'], 'putrid': ['202408040000'], 'frivolous':['202408030000'], 'simple':['202408020000'], 'apple':['202408010000']}
-    )
-    assert 5 <= user.level <= 8
- 
-def test_user_level_consider_only_most_recent_words_easy_words_most_recent():
-    ''' Consider only the most recent three words '''
-    user = UserVocabularyLevel(
-        {'simple':['202408050930'], 'apple': ['202408040000'], 'happy':['202408030000'], 'pasture':['202408020000'], 'putrid':['202408010000'], 'dearth':['202407310000']}
-    )
-    assert 4 <= user.level <= 5