-
Notifications
You must be signed in to change notification settings - Fork 10
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* thinx-staging: (181 commits) log leak fix log cleanup, redeploy after changing expired Rollbar Project Access Tokens submodule sync version bump, log cleanup and base image update after fixing GitHub OAuth dependency updates, fixing github login (has code but different object structure) test passes, but parsing fails spec fix for staging fails in tests, because code is B removed json fixes gpg debugging broken github-oauth login task renamed recent test passed, build stable, adding debug logging only for next refactoring steps fix for potent. unlinked github login addRoutes recent test passed, build stable, adding debug logging only for next refactoring steps github fix ssrf fix fix axios get error moved from got to axios ...
- Loading branch information
Showing
251 changed files
with
30,636 additions
and
10,451 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1 @@ | ||
| repo_token: nJpg2RHfxQRyMMmHAYmGTUyWa3B7L76ty | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,6 @@ | ||
| clair* | ||
| .git | ||
| node_modules/ | ||
| **/node_modules/ | ||
| package-lock.json | ||
| tools/arduino-docker-build | ||
| tools/platformio-docker-build | ||
| tools/micropython-docker-build | ||
| tools/mongoose-docker-build | ||
| tools/nodemcu-docker-build | ||
| tools/nodemcu-firmware | ||
| tools/lua-inspect | ||
|
|
||
| conf/ | ||
| tools/ | ||
| conf/ | ||
| clair* |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| name: "Checkmarx" | ||
|
|
||
| on: | ||
| push: | ||
| branches: [master, thinx-staging, main] | ||
| pull_request: | ||
| # The branches below must be a subset of the branches above | ||
| branches: [master, thinx-staging, main] | ||
| schedule: | ||
| - cron: '0 18 * * 5' | ||
|
|
||
| jobs: | ||
| analyze: | ||
| name: Analyze | ||
| runs-on: ubuntu-latest | ||
|
|
||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| # Override automatic language detection by changing the below list | ||
| # Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python'] | ||
| language: ['javascript'] | ||
| # Learn more... | ||
| # https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection | ||
|
|
||
| steps: | ||
| - name: Checkmarx AST Github Action | ||
| uses: Checkmarx/[email protected] | ||
|
|
||
| with: | ||
| base_uri: https://ast.checkmarx.net/ | ||
| cx_tenant: nfr_nfr_ast_corpus | ||
| cx_client_id: ${{ secrets.CX_CLIENT_ID }} | ||
| cx_client_secret: ${{ secrets.CX_CLIENT_SECRET }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| FROM thinxcloud/base:alpine | ||
|
|
||
| LABEL maintainer="Matej Sychra <[email protected]>" | ||
| LABEL name="THiNX API" version="1.8.2247" | ||
| LABEL name="THiNX API" version="1.9.2451" | ||
|
|
||
| ARG DEBIAN_FRONTEND=noninteractive | ||
|
|
||
|
|
@@ -47,9 +47,17 @@ ARG GITHUB_CLIENT_ID | |
| ENV GITHUB_CLIENT_ID=${GITHUB_CLIENT_ID} | ||
| ARG GITHUB_CLIENT_SECRET | ||
| ENV GITHUB_CLIENT_SECRET=${GITHUB_CLIENT_SECRET} | ||
| ARG GITHUB_ACCESS_TOKEN | ||
| ENV GITHUB_ACCESS_TOKEN={GITHUB_ACCESS_TOKEN} | ||
|
|
||
| ARG SLACK_BOT_TOKEN | ||
| ENV SLACK_BOT_TOKEN=${SLACK_BOT_TOKEN} | ||
| ARG SLACK_CLIENT_ID | ||
| ENV SLACK_CLIENT_ID=${SLACK_CLIENT_ID} | ||
| ARG SLACK_CLIENT_SECRET | ||
| ENV SLACK_CLIENT_SECRET=${SLACK_CLIENT_SECRET} | ||
| ARG SLACK_WEBHOOK | ||
| ENV SLACK_WEBHOOK=${SLACK_WEBHOOK} | ||
|
|
||
| ARG ENTERPRISE | ||
| ENV ENTERPRISE=${ENTERPRISE} | ||
|
|
@@ -66,8 +74,8 @@ WORKDIR /opt/thinx/thinx-device-api | |
| # Install app dependencies | ||
| COPY package.json ./ | ||
|
|
||
| RUN npm install -g npm@8.6.0 \ | ||
| && npm install --unsafe-perm --only-prod . | ||
| RUN npm install -g npm@10.2.3 \ | ||
| && npm install --only-prod . | ||
|
|
||
| # THiNX Web & Device API (HTTP) | ||
| EXPOSE 7442 | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,10 @@ | ||
| FROM thinxcloud/base:alpine | ||
|
|
||
| LABEL maintainer="Matej Sychra <[email protected]>" | ||
| LABEL name="THiNX API" version="1.8.2247" | ||
| LABEL name="THiNX API" version="1.9.2451" | ||
|
|
||
| ARG DEBIAN_FRONTEND=noninteractive | ||
|
|
||
| # For test-env node-18 | ||
| ENV NODE_TLS_REJECT_UNAUTHORIZED=0 | ||
| ENV NODE_EXTRA_CA_CERTS=/mnt/data/ssl/testRoot.crt | ||
|
|
||
| ARG THINX_HOSTNAME | ||
| ENV THINX_HOSTNAME=${THINX_HOSTNAME} | ||
|
|
||
|
|
@@ -33,9 +29,6 @@ ENV AQUA_SEC_TOKEN=${AQUA_SEC_TOKEN} | |
| ARG SNYK_TOKEN | ||
| ENV SNYK_TOKEN=${SNYK_TOKEN} | ||
|
|
||
| ARG GITHUB_ACCESS_TOKEN | ||
| ENV GITHUB_ACCESS_TOKEN={GITHUB_ACCESS_TOKEN} | ||
|
|
||
| ARG ENVIRONMENT | ||
| ENV ENVIRONMENT=${ENVIRONMENT} | ||
|
|
||
|
|
@@ -54,9 +47,17 @@ ARG GITHUB_CLIENT_ID | |
| ENV GITHUB_CLIENT_ID=${GITHUB_CLIENT_ID} | ||
| ARG GITHUB_CLIENT_SECRET | ||
| ENV GITHUB_CLIENT_SECRET=${GITHUB_CLIENT_SECRET} | ||
| ARG GITHUB_ACCESS_TOKEN | ||
| ENV GITHUB_ACCESS_TOKEN={GITHUB_ACCESS_TOKEN} | ||
|
|
||
| ARG SLACK_BOT_TOKEN | ||
| ENV SLACK_BOT_TOKEN=${SLACK_BOT_TOKEN} | ||
| ARG SLACK_CLIENT_ID | ||
| ENV SLACK_CLIENT_ID=${SLACK_CLIENT_ID} | ||
| ARG SLACK_CLIENT_SECRET | ||
| ENV SLACK_CLIENT_SECRET=${SLACK_CLIENT_SECRET} | ||
| ARG SLACK_WEBHOOK | ||
| ENV SLACK_WEBHOOK=${SLACK_WEBHOOK} | ||
|
|
||
| ARG GITHUB_SECRET | ||
| ENV GITHUB_SECRET=${GITHUB_SECRET} | ||
|
|
@@ -73,6 +74,9 @@ ENV CIRCLE_NODE_TOTAL=${CIRCLE_NODE_TOTAL} | |
| ARG CIRCLE_NODE_INDEX | ||
| ENV CIRCLE_NODE_INDEX=${CIRCLE_NODE_INDEX} | ||
|
|
||
| ARG NODE_COVERALLS_DEBUG | ||
| ENV NODE_COVERALLS_DEBUG=0 | ||
|
|
||
| # Create app directory | ||
| WORKDIR /opt/thinx/thinx-device-api | ||
|
|
||
|
|
@@ -82,7 +86,7 @@ RUN apk add openjdk8-jre p7zip | |
| # Install app dependencies | ||
| COPY package.json ./ | ||
|
|
||
| RUN npm install -g npm@8.6.0 \ | ||
| RUN npm install -g npm@10.2.3 \ | ||
| && npm install . | ||
|
|
||
| VOLUME /var/lib/docker | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| [ | ||
| { | ||
| "CWEId": "259", | ||
| "FlawMatch": { | ||
| "ProcedureHash": "1057981634", | ||
| "PrototypeHash": "2924686005", | ||
| "FlawHash": "2666345062", | ||
| "FlawHashCount": "1", | ||
| "FlawHashOrdinal": "1", | ||
| "CauseHash": "3488685266", | ||
| "CauseHashCount": "1", | ||
| "CauseHashOrdinal": "1", | ||
| "CauseHash2": "0", | ||
| "CauseHash2Ordinal": "0" | ||
| }, | ||
| "Files": { | ||
| "SourceFile": { | ||
| "File": "auth.js", | ||
| "Line": "23", | ||
| "FunctionName": "add_mqtt_credentials", | ||
| "QualifiedFunctionName": "Auth.add_mqtt_credentials", | ||
| "FunctionPrototype": "add_mqtt_credentials(: ::Auth, : any, : any, : any, ...) : any", | ||
| "Scope": "^::Auth", | ||
| "AbsoluteFilePath": "/Users/sychram/Repositories/thinx-device-api/lib/thinx/auth.js" | ||
| } | ||
| } | ||
| } | ||
| ] |
Submodule base
updated
5 files
| +1 −0 | .cxast | |
| +3 −4 | Dockerfile | |
| +3 −0 | README.md | |
| +2,162 −2,451 | package-lock.json | |
| +19 −19 | package.json |
Submodule arduino-docker-build
updated
7 files
| +76 −5 | .circleci/config.yml | |
| +3 −0 | .dockerignore | |
| +33 −43 | Dockerfile | |
| +66 −0 | Dockerfile.esp32 | |
| +65 −0 | Dockerfile.esp8266 | |
| +2 −4 | README.md | |
| +6 −6 | cmd.sh |
Oops, something went wrong.