diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml new file mode 100644 index 0000000..1af7137 --- /dev/null +++ b/.github/workflows/codeql.yml @@ -0,0 +1,92 @@ +# For most projects, this workflow file will not need changing; you simply need +# to commit it to your repository. +# +# You may wish to alter this file to override the set of languages analyzed, +# or to provide custom queries or build logic. +# +# ******** NOTE ******** +# We have attempted to detect the languages in your repository. Please check +# the `language` matrix defined below to confirm you have the correct set of +# supported CodeQL languages. +# +name: "CodeQL Advanced" + +on: + push: + branches: [ "master" ] + pull_request: + branches: [ "master" ] + schedule: + - cron: '18 13 * * 0' + +jobs: + analyze: + name: Analyze (${{ matrix.language }}) + # Runner size impacts CodeQL analysis time. To learn more, please see: + # - https://gh.io/recommended-hardware-resources-for-running-codeql + # - https://gh.io/supported-runners-and-hardware-resources + # - https://gh.io/using-larger-runners (GitHub.com only) + # Consider using larger runners or machines with greater resources for possible analysis time improvements. + runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }} + permissions: + # required for all workflows + security-events: write + + # required to fetch internal or private CodeQL packs + packages: read + + # only required for workflows in private repositories + actions: read + contents: read + + strategy: + fail-fast: false + matrix: + include: + - language: javascript-typescript + build-mode: none + # CodeQL supports the following values keywords for 'language': 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift' + # Use `c-cpp` to analyze code written in C, C++ or both + # Use 'java-kotlin' to analyze code written in Java, Kotlin or both + # Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both + # To learn more about changing the languages that are analyzed or customizing the build mode for your analysis, + # see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning. + # If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how + # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + # Initializes the CodeQL tools for scanning. + - name: Initialize CodeQL + uses: github/codeql-action/init@v3 + with: + languages: ${{ matrix.language }} + build-mode: ${{ matrix.build-mode }} + # If you wish to specify custom queries, you can do so here or in a config file. + # By default, queries listed here will override any specified in a config file. + # Prefix the list here with "+" to use these queries and those in the config file. + + # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs + # queries: security-extended,security-and-quality + + # If the analyze step fails for one of the languages you are analyzing with + # "We were unable to automatically build your code", modify the matrix above + # to set the build mode to "manual" for that language. Then modify this step + # to build your code. + # â„šī¸ Command-line programs to run using the OS shell. + # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun + - if: matrix.build-mode == 'manual' + shell: bash + run: | + echo 'If you are using a "manual" build mode for one or more of the' \ + 'languages you are analyzing, replace this with the commands to build' \ + 'your code, for example:' + echo ' make bootstrap' + echo ' make release' + exit 1 + + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v3 + with: + category: "/language:${{matrix.language}}" diff --git a/README.md b/README.md index 3553dbb..190567b 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,6 @@ The minimalistic browser, fully open source. We don't recommend using the dev environment when running Daylight. The code that runs in the dev environment is unoptimized and will most likely be slow. Build it, then run. This is a Proxathon 2024 entry. -Instructions to run this for yourself (using the github repo) will arrive later after the competition has ended. # Devs - [KDust7](https://guns.lol/KDust7) @@ -14,3 +13,19 @@ Instructions to run this for yourself (using the github repo) will arrive later - TS - Node - React + +## Official Instance +The official instance (demo) is available [here](https://daylight-prod.vercel.app). (do not believe whatever link is in the description, that is outdated.) + +## Deployment + +To run the Daylight demo, first clone the repo by running: +`git clone https://github.com/NightProxy/Daylight` +Then, go into the newly created folder, named Daylight. +`cd Daylight` + +Then, run this code: +`npm i && npm run dyl` +Replace npm in the above code with pnpm, yarn, or bun corresponding to your package manager of choice. + +After you've successfully ran it with no issues, Daylight will be available at localhost:8080. diff --git a/index.js b/index.js index 794d6b4..6afb705 100644 --- a/index.js +++ b/index.js @@ -18,7 +18,7 @@ import { baremuxPath } from "@mercuryworkshop/bare-mux/node"; import { meteorPath } from "meteorproxy" import wisp from "wisp-server-node"; import { createBareServer } from "@tomphttp/bare-server-node" -//wahts the library i forgot +import RateLimit from "express-rate-limit"; import net from "node:net" import { hostname } from "node:os" const __filename = fileURLToPath(import.meta.url); @@ -91,7 +91,6 @@ const proxies = [ "$/scramjet.worker.js.map", "epoxy/index.js", "epoxy/index.mjs", - "epoxy/module.js", "libcurl/index.cjs", "libcurl/index.js", "libcurl/index.mjs" @@ -295,6 +294,15 @@ function startServer() { console.log(chalk.green("Serving", chalk.yellow("Daylight's"), chalk.green("files"))); console.log(chalk.green("All necessary files served. Setting up server.")) + // set up rate limiter: maximum of 100 requests per 15 minutes + const limiter = RateLimit({ + windowMs: 15 * 60 * 1000, // 15 minutes + max: 100, // max 100 requests per windowMs + }); + + // apply rate limiter to all requests + app.use(limiter); + app.get("/", (req, res) => { res.sendFile(path.join(__dirname, "dist/index.html")); }); diff --git a/package.json b/package.json index 29e1769..7983a16 100644 --- a/package.json +++ b/package.json @@ -94,10 +94,11 @@ "tailwindcss-animate": "^1.0.7", "tsx": "^4.16.2", "vaul": "^0.9.1", - "vite-plugin-static-copy": "^1.0.6", + "vite-plugin-static-copy": "^3.1.2", "vite-plugin-vsharp": "^1.8.1", "wisp-server-node": "^1.1.3", - "zod": "^3.23.8" + "zod": "^3.23.8", + "express-rate-limit": "^7.5.0" }, "devDependencies": { "@babel/core": "^7.24.9",