more changes

- updated some dependencies, making lint work again - decrease builder size - run prettier on the files
appventure-nush · Dec 26, 2023 · 57ec710 · 57ec710
1 parent 0e0aebd
commit 57ec710
Show file tree

Hide file tree

Showing 87 changed files with 3,090 additions and 2,748 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -1,7 +1,8 @@
 {
   "parserOptions": {
     "parser": "@typescript-eslint/parser",
-    "project": "./tsconfig.json"
+    "project": "./tsconfig.json",
+    "extraFileExtensions": [".vue"]
   },
   "env": {
     "browser": true,
@@ -19,11 +20,14 @@
     "comma-dangle": ["error", "always-multiline"],
     "vue/attributes-order": "off",
     "@typescript-eslint/indent": ["error", 2],
-    "@typescript-eslint/explicit-function-return-type": ["error", {
-      "allowExpressions": true,
-      "allowHigherOrderFunctions": true,
-      "allowTypedFunctionExpressions": true
-    }]
+    "@typescript-eslint/explicit-function-return-type": [
+      "error",
+      {
+        "allowExpressions": true,
+        "allowHigherOrderFunctions": true,
+        "allowTypedFunctionExpressions": true
+      }
+    ]
   },
   "overrides": [
     {

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -7,16 +7,14 @@ on:
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
 
-
     steps:
-#      - name: Use Node.js 16.19.0
-#        uses: actions/setup-node@v3
-#        with:
-#          node-version: 16.19.0
-#      - run: npm run genrss
+      #      - name: Use Node.js 16.19.0
+      #        uses: actions/setup-node@v3
+      #        with:
+      #          node-version: 16.19.0
+      #      - run: npm run genrss
       - uses: actions/checkout@v2
 
       - name: Push image to AppVenture registry
@@ -33,12 +31,11 @@ jobs:
       - name: Check if static files changed
         uses: dorny/paths-filter@v2
         id: filter
-        with: 
+        with:
           filters: |
             static:
               - 'static-large/**'
 
-
       - name: Push large static files image to AppVenture registry
         uses: docker/build-push-action@v1
         if: steps.filter.outputs.static == 'true'

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:16 AS builder
+FROM node:16-slim AS builder
 
 WORKDIR /app
 
@@ -9,9 +9,7 @@ RUN yarn install --frozen-lockfile
 # replace the values in constants.ts
 COPY src/constants.ts src/constants.ts
 ARG STATIC_URL
-ENV STATIC_URL ${STATIC_URL}
-RUN apt-get update && apt-get install -y gettext-base
-RUN envsubst < src/constants.ts > src/constants.ts.tmp
+RUN sed "s#%STATIC_URL%#${STATIC_URL}#g" src/constants.ts > src/constants.ts.tmp
 
 # copy everything in
 COPY . .

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
-# AppVenture Website V4 
+# AppVenture Website V4
 
-This project is based the starter template for Gridsome using Typescript. It uses **eslint** and **typescript** for static code analysis. In order to integrate these tools with Visual Studio Code, you'll need to install **ESLint** and **Vetur** extensions for the editor. 
+This project is based the starter template for Gridsome using Typescript. It uses **eslint** and **typescript** for static code analysis. In order to integrate these tools with Visual Studio Code, you'll need to install **ESLint** and **Vetur** extensions for the editor.
 
 Before contributing a blog article, check the [documentation](doc/contributions.md)
 
@@ -23,7 +23,7 @@ Before contributing a blog article, check the [documentation](doc/contributions.
 
 ### 4. Static Code Analysis - Visual Studio Code
 
-As mentioned before, in order to lint your Typescript code in `*.vue` *Single File Components* with *vscode* you'll need to install [`ESLint`](https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint) and [`Vetur`](https://marketplace.visualstudio.com/items?itemName=octref.vetur) extensions for the editor.
+As mentioned before, in order to lint your Typescript code in `*.vue` _Single File Components_ with _vscode_ you'll need to install [`ESLint`](https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint) and [`Vetur`](https://marketplace.visualstudio.com/items?itemName=octref.vetur) extensions for the editor.
 
 Use the links above to install the extensions, or follow the steps below:
 
@@ -33,15 +33,16 @@ Use the links above to install the extensions, or follow the steps below:
 4. Do same thing for **Vetur** extension
 
 ### 5. Useful links
-* [Repository Documentation](doc/contributions.md)
-* [Gridsome docs](https://gridsome.org/docs/)
-* [Typescript docs](https://www.typescriptlang.org/docs/)
-* [ESLint docs](https://eslint.org/)
-* [ESLint rules](https://eslint.org/docs/rules/)
-* [Typescript rules](https://github.com/typescript-eslint/typescript-eslint/tree/master/packages/eslint-plugin#supported-rules)
-* [Vue rules](https://vuejs.github.io/eslint-plugin-vue/rules/)
-* [ESLint extension for vscode](https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint)
-* [Vetur extension for vscode](https://marketplace.visualstudio.com/items?itemName=octref.vetur)
+
+- [Repository Documentation](doc/contributions.md)
+- [Gridsome docs](https://gridsome.org/docs/)
+- [Typescript docs](https://www.typescriptlang.org/docs/)
+- [ESLint docs](https://eslint.org/)
+- [ESLint rules](https://eslint.org/docs/rules/)
+- [Typescript rules](https://github.com/typescript-eslint/typescript-eslint/tree/master/packages/eslint-plugin#supported-rules)
+- [Vue rules](https://vuejs.github.io/eslint-plugin-vue/rules/)
+- [ESLint extension for vscode](https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint)
+- [Vetur extension for vscode](https://marketplace.visualstudio.com/items?itemName=octref.vetur)
 
 ### 6. Build and Run Docker Container
 

diff --git a/content/blog/CDDC-2023/index.md b/content/blog/CDDC-2023/index.md
@@ -3,7 +3,7 @@ title: CDDC 2023
 slug: CDDC-2023
 author: [kane]
 date: 2023-07-05
-tags: [ctf,writeup]
+tags: [ctf, writeup]
 ---
 
 ## In the middle of Rust
@@ -17,70 +17,75 @@ We decided to do the stupid thing and manually reverse it by hand, painstakingly
 Let's dig into the main function first:
 It first defines like 120 variables, but we can worry about that later. the nested `scope{ }` are also all useless.
 
-We see a lot of `bb0`, `bb1`, etc, those are *basic blocks* inside the `.mir` file. They represent a sequence of instructions or statements, and determine how the program flows. Let's start with `bb0` in `main`:
+We see a lot of `bb0`, `bb1`, etc, those are _basic blocks_ inside the `.mir` file. They represent a sequence of instructions or statements, and determine how the program flows. Let's start with `bb0` in `main`:
 
 ```rust
 bb0: {
-    _1 = func001(const 126_u8) -> bb1;                                   
+    _1 = func001(const 126_u8) -> bb1;
 }
 ```
+
 where `func001` is:
+
 ```rust
 fn func001(_1: u8) -> u8 {
-    debug ch => _1;                      
-    let mut _0: u8;                      
-    let mut _2: u8;                      
-    let mut _3: (u8, bool);              
-    let mut _4: u8;                      
-    let mut _5: u8;                      
-    let mut _6: (u8, bool);              
-    let mut _7: (u8, bool);              
+    debug ch => _1;
+    let mut _0: u8;
+    let mut _2: u8;
+    let mut _3: (u8, bool);
+    let mut _4: u8;
+    let mut _5: u8;
+    let mut _6: (u8, bool);
+    let mut _7: (u8, bool);
     scope 1 {
-        debug retn => _0;                
+        debug retn => _0;
     }
 
     bb0: {
-        _0 = _1;                         
-        _2 = _0;                         
+        _0 = _1;
+        _2 = _0;
         _3 = CheckedShr(_2, const 3_i32); // rshift _3 by 3
-        assert(!move (_3.1: bool), "attempt to shift right by `{}`, which would overflow", const 3_i32) -> bb1; 
+        assert(!move (_3.1: bool), "attempt to shift right by `{}`, which would overflow", const 3_i32) -> bb1;
     }
 
     bb1: {
         _0 = move (_3.0: u8);
         _5 = _0;
         _6 = CheckedMul(_5, const 4_u8); // multiply _5 by 4
-        assert(!move (_6.1: bool), "attempt to compute `{} * {}`, which would overflow", move _5, const 4_u8) -> bb2; 
+        assert(!move (_6.1: bool), "attempt to compute `{} * {}`, which would overflow", move _5, const 4_u8) -> bb2;
     }
 
     bb2: {
-        _4 = move (_6.0: u8);            
+        _4 = move (_6.0: u8);
         _7 = CheckedAdd(_4, const 7_u8); // add 7 to _4
-        assert(!move (_7.1: bool), "attempt to compute `{} + {}`, which would overflow", move _4, const 7_u8) -> bb3; 
+        assert(!move (_7.1: bool), "attempt to compute `{} + {}`, which would overflow", move _4, const 7_u8) -> bb3;
     }
 
     bb3: {
-        _0 = move (_7.0: u8);            
-        return;                          
+        _0 = move (_7.0: u8);
+        return;
     }
 }
 ```
 
 Which is basically:
+
 ```rust
 bb0: {
     _1 = (126 >> 3) * 4 + 7 -> bb1; // 67
 }
 ```
 
 Now let's see `bb1`:
+
 ```rust
 bb1: {
-    _3 = _1;                         
-    _2 = move _3 as char (IntToInt); 
-	_4 = func002(const 51_u8) -> bb2; 
+    _3 = _1;
+    _2 = move _3 as char (IntToInt);
+	_4 = func002(const 51_u8) -> bb2;
 }
 ```
+
 We see it makes a a char labelled `_2`, which I assume is the characters of the flag. It also tries to feed `bb2`, the next block, with `func002(51)`, which will later become another character in the flag. From now on we just focused on evaluating these `funcxxx()` and its output.
 
 The next several functions are all elementary ones, comprising of addition, subtraction, multiplication, division, and bitwise operators.
@@ -106,9 +111,9 @@ fn func010(_1: u8) -> u8 {
     }
 
     bb0: {
-        _0 = _1;                         
+        _0 = _1;
         _3 = std::ops::Range::<i32> { start: const 0_i32, end: const 10_i32 };  // loop of count 10
-        _2 = <std::ops::Range<i32> as IntoIterator>::into_iter(move _3) -> bb1; 
+        _2 = <std::ops::Range<i32> as IntoIterator>::into_iter(move _3) -> bb1;
     }
 
     bb1: {
@@ -136,7 +141,7 @@ fn func010(_1: u8) -> u8 {
     }
 
     bb6: {
-        return;                     
+        return;
     }
 
     bb7: {
@@ -147,7 +152,7 @@ fn func010(_1: u8) -> u8 {
 ```
 
 It is essentially a for loop of 10, and each time it loops `_0` gets incremented by 1 (via `_8`)
-Therefore `func010(109) = 119` which corresponds to ``'w'``
+Therefore `func010(109) = 119` which corresponds to `'w'`
 
 The next several functions are also elementary ones, comprising of addition, subtraction, multiplication, division, and bitwise operators, and also exponentiation.
 
@@ -247,71 +252,71 @@ The last weird function is `func033`;
 
 ```rust
 fn func033(_1: u8) -> u8 {
-    debug ch => _1;                      
-    let mut _0: u8;                      
-    let mut _2: std::ops::Range<i32>;    
-    let mut _3: std::ops::Range<i32>;    
-    let mut _5: std::option::Option<i32>; 
-    let mut _6: &mut std::ops::Range<i32>; 
-    let mut _7: isize;                   
-    let mut _9: i32;                     
-    let mut _10: (u8, bool);             
+    debug ch => _1;
+    let mut _0: u8;
+    let mut _2: std::ops::Range<i32>;
+    let mut _3: std::ops::Range<i32>;
+    let mut _5: std::option::Option<i32>;
+    let mut _6: &mut std::ops::Range<i32>;
+    let mut _7: isize;
+    let mut _9: i32;
+    let mut _10: (u8, bool);
     scope 1 {
-        debug retn => _0;                
-        let mut _4: std::ops::Range<i32>; 
+        debug retn => _0;
+        let mut _4: std::ops::Range<i32>;
         scope 2 {
-            debug iter => _4;            
-            let _8: i32;                 
+            debug iter => _4;
+            let _8: i32;
             scope 3 {
-                debug i => _8;           
+                debug i => _8;
             }
         }
     }
 
     bb0: {
-        _0 = _1;  // 106                       
-        _3 = std::ops::Range::<i32> { start: const 0_i32, end: const 10_i32 }; 
-        _2 = <std::ops::Range<i32> as IntoIterator>::into_iter(move _3) -> bb1; 
-                                         
+        _0 = _1;  // 106
+        _3 = std::ops::Range::<i32> { start: const 0_i32, end: const 10_i32 };
+        _2 = <std::ops::Range<i32> as IntoIterator>::into_iter(move _3) -> bb1;
+
     }
 
     bb1: {
-        _4 = move _2;                    
-        goto -> bb2;                     
+        _4 = move _2;
+        goto -> bb2;
     }
 
     bb2: {
-        _6 = &mut _4;                    
-        _5 = <std::ops::Range<i32> as Iterator>::next(_6) -> bb3; 
+        _6 = &mut _4;
+        _5 = <std::ops::Range<i32> as Iterator>::next(_6) -> bb3;
     }
 
     bb3: {
-        _7 = discriminant(_5);           
-        switchInt(move _7) -> [0: bb6, 1: bb4, otherwise: bb5]; 
+        _7 = discriminant(_5);
+        switchInt(move _7) -> [0: bb6, 1: bb4, otherwise: bb5];
     }
 
     bb4: {
-        _8 = ((_5 as Some).0: i32);      
-        _9 = Rem(_8, const 2_i32);       
-        switchInt(move _9) -> [0: bb7, otherwise: bb2]; 
+        _8 = ((_5 as Some).0: i32);
+        _9 = Rem(_8, const 2_i32);
+        switchInt(move _9) -> [0: bb7, otherwise: bb2];
     }
 
     bb5: {
-        unreachable;                     
+        unreachable;
     }
 
     bb6: {
-        return;                          
+        return;
     }
 
     bb7: {
-        _10 = CheckedAdd(_0, const 1_u8); 
-        assert(!move (_10.1: bool), "attempt to compute `{} + {}`, which would overflow", _0, const 1_u8) -> bb8; 
+        _10 = CheckedAdd(_0, const 1_u8);
+        assert(!move (_10.1: bool), "attempt to compute `{} + {}`, which would overflow", _0, const 1_u8) -> bb8;
     }
 
     bb8: {
-        _0 = move (_10.0: u8);           
-        goto -> bb2;                     
+        _0 = move (_10.0: u8);
+        goto -> bb2;
     }
 }
 ```
@@ -342,15 +347,19 @@ Tags: web
 So we are given a username and password field. I tried username `admin` and password `' or 1=1;#` and it worked - it just said "Hello admin" - so it is vulnerable to SQL Injection
 
 I assumed that the query was something like this:
+
 ```SQL
 SELECT <thing> FROM <thetable> WHERE id = '{id}' AND pw = '{pw}';
 ```
 
 We see that the url is `http://52.78.16.36:8881/web1/?id=admin&pw=password`, so the column name is probably `pw`, so we can inject:
+
 ```
 ' or 1=1 or pw LIKE '%';#
 ```
+
 We then replace the `%` with increasingly many `_` until we find one that matches - oh wait it says "no hack", so that probably does not work. Whatever since `%` is not filtered lets use that to get the password:
+
 ```python
 import requests
 base = "http://52.78.16.36:8881/web1/"
@@ -374,4 +383,5 @@ while True:
         print("Wrong: "+pw)
         id += 1
 ```
-the result is `end: ' OR pw LIKE 'ADMIN123PW⌂%';#`, and ignoring the last few bits we get `ADMIN123PW`, but that still doesnt give us the flag. Since `LIKE` is not case-senstive, and we can't using `SUBSTRING` since I dont know the table name, we can only try for different combinations of upper and lowercase. I tried all lowercase instead (i.e. `admin123pw`) and I got the flag.
+
+the result is `end: ' OR pw LIKE 'ADMIN123PW⌂%';#`, and ignoring the last few bits we get `ADMIN123PW`, but that still doesnt give us the flag. Since `LIKE` is not case-senstive, and we can't using `SUBSTRING` since I dont know the table name, we can only try for different combinations of upper and lowercase. I tried all lowercase instead (i.e. `admin123pw`) and I got the flag.