Merge pull request #904 from ronreiter/general-server-hardening

General server hardening + wire up new sites

Author: ronreiter

constants.py

@@ -18,6 +18,8 @@
 LEARNSOLIDITY_DOMAIN = "learnsolidity.org"
 LEARNSQL_DOMAIN = "learnsqlonline.org"
 LEARNTS_DOMAIN = "learn-ts.org"
+LEARNRUST_DOMAIN = "learnrust.org"
+LEARNASSEMBLY_DOMAIN = "learnassembly.org"
 
 
 from collections import OrderedDict
@@ -414,22 +416,76 @@ def main(args: Array[String]) {
 """,
 }
 
-# DOMAIN_DATA[LEARNSOLIDITY_DOMAIN] = {
-#         "language" : "solidity",
-#         "codemirror_mode": "text/x-solidity",
-#         "prism_mode": "language-solidity",
-#         "analytics" : "UA-22741967-15",
-#         "language_uppercase" : "Solidity",
-#         "default_code" : """// Welcome to the Interactive Solidity Tutorial.
-# // Start by choosing a chapter, write your code in this window.
-#
-# """,
-#         "container_word" : "",
-#         "container_indent" : "",
-#         "container" : """
-# """,
-#
-# }
+DOMAIN_DATA[LEARNSOLIDITY_DOMAIN] = {
+        "language" : "solidity",
+        "codemirror_mode": "text/x-solidity",
+        "prism_mode": "language-solidity",
+        "analytics" : "UA-22741967-15",
+        "language_uppercase" : "Solidity",
+        "default_code" : """// Welcome to the Interactive Solidity Tutorial.
+// Start by choosing a chapter, write your code in this window.
+
+""",
+        "container_word" : "",
+        "container_indent" : "",
+        "container" : """
+""",
+
+}
+
+DOMAIN_DATA[LEARNASSEMBLY_DOMAIN] = {
+        "language" : "assembly",
+        "language_id": 13,
+        "codemirror_mode": "text/x-gas",
+        "prism_mode": "language-asm6502",
+        "analytics" : "UA-22741967-17",
+        "language_uppercase" : "Assembly",
+        "default_code" : """; Welcome to the Interactive Assembly Tutorial.
+; Start by choosing a chapter, write your code in this window.
+
+section .data
+    msg db 'Hello, World!', 0xa
+    len equ $ - msg
+
+section .text
+    global _start
+    _start:
+        mov rax, 1
+        mov rdi, 1
+        mov rsi, msg
+        mov rdx, len
+        syscall
+        mov rax, 60
+        xor rdi, rdi
+        syscall
+""",
+        "container_word" : "",
+        "container_indent" : "",
+        "container" : """
+""",
+
+}
+
+DOMAIN_DATA[LEARNRUST_DOMAIN] = {
+        "language" : "rust",
+        "language_id": 44,
+        "codemirror_mode": "text/x-rust",
+        "prism_mode": "language-rust",
+        "analytics" : "UA-22741967-18",
+        "language_uppercase" : "Rust",
+        "default_code" : """// Welcome to the Interactive Rust Tutorial.
+// Start by choosing a chapter, write your code in this window.
+
+fn main() {
+    println!("Hello, World!");
+}
+""",
+        "container_word" : "",
+        "container_indent" : "",
+        "container" : """
+""",
+
+}
 
 DOMAIN_DATA[LEARNSQL_DOMAIN] = {
         "language" : "sql",

main.py

@@ -27,7 +27,7 @@
 app.secret_key = constants.SECRET_KEY
 
 sections = re.compile(r"Tutorial\n[=\-]+\n+(.*)\n*Tutorial Code\n[=\-]+\n+(.*)\n*Expected Output\n[=\-]+\n+(.*)\n*Solution\n[=\-]+\n*(.*)\n*", re.MULTILINE | re.DOTALL)
-WIKI_WORD_PATTERN = re.compile('\[\[([^]|]+\|)?([^]]+)\]\]')
+WIKI_WORD_PATTERN = re.compile(r'\[\[([^]|]+\|)?([^]]+)\]\]')
 
 current_domain = os.environ.get("DEFAULT_DOMAIN", constants.LEARNPYTHON_DOMAIN)
 
@@ -161,9 +161,13 @@ def init_tutorials():
 
             tutorials = os.listdir(tutorials_path)
 
-            # place the index file first
-            tutorials.remove("Welcome.md")
-            tutorials = ["Welcome.md"] + tutorials
+            # place the index file first; tolerate a missing Welcome.md
+            if "Welcome.md" in tutorials:
+                tutorials.remove("Welcome.md")
+                tutorials = ["Welcome.md"] + tutorials
+            else:
+                logging.warning("No Welcome.md for domain %s language %s", domain, language)
+                tutorials.sort()
             for tutorial_file in tutorials:
                 if not tutorial_file.endswith(".md"):
                     continue
@@ -326,35 +330,12 @@ def static_file():
 
 @app.route("/signin")
 def signin():
-    email = request.args.get("email", None)
-    password = request.args.get("password", None)
-    user = users.findOne({"email": email})
-
-    if user:
-        session["user_id"] = str(user._id)
-        return make_response(json.dumps({"status": "error", "error": "no_user"}))
+    # No user store exists in this repository; these endpoints were non-functional.
+    return make_response(json.dumps({"status": "error", "error": "not_implemented"}), 501)
 
 @app.route("/signup")
 def signup():
-    email = request.args.get("email", None)
-    password = request.args.get("password", None)
-    confirm = request.args.get("confirm", None)
-
-    if not email or not password or not confirm:
-        return make_response(json.dumps({"status": "error", "error": "missing_field"}))
-
-    if not re.findall("^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,4})$", email):
-        return make_response(json.dumps({"status": "error", "error": "invalid_email"}))
-
-    if password != confirm:
-        return make_response(json.dumps({"status": "error", "error": "passwords_dont_match"}))
-
-    id = users.insert({
-        "email": email,
-        "password": password,
-    })
-
-    session["user_id"] = str(id)
+    return make_response(json.dumps({"status": "error", "error": "not_implemented"}), 501)
 
 
 @app.route("/<language>/progress")

pyproject.toml

@@ -15,6 +15,7 @@ python-geoip = "^1.2"
 
 [tool.poetry.group.dev.dependencies]
 openai = "^1.58.1"
+pytest = "^7.4.0"
 
 [build-system]
 requires = ["poetry-core"]