Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

changed password hash to bcrypt fixes #454 #457

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
80c49b1
chore: remove unused images & files + renaming of files
JamieSlome Oct 31, 2023
b5162fc
chore: implement eslint and prettier scripts + run lint and formatter
JamieSlome Oct 31, 2023
0d67262
chore: remove eslint-disable at file level and fix import statements …
JamieSlome Nov 1, 2023
fa2f029
Merge branch 'main' into reconcile
JamieSlome Nov 7, 2023
37d37ef
chore: cascade changes to root of /src folder
JamieSlome Nov 7, 2023
dc6ce86
Merge branch 'reconcile' of https://github.com/finos/git-proxy into r…
JamieSlome Nov 7, 2023
2c2ad15
chore: reconcile src/ui/assets folder
JamieSlome Nov 7, 2023
250cde4
chore: reconcile src/ui/components folder
JamieSlome Nov 7, 2023
3b59292
chore: reconcile src/ui/layouts folder
JamieSlome Nov 7, 2023
dea18e5
fix: convert default user array to object in admin.jsx
JamieSlome Nov 7, 2023
25dbeb7
chore: replace usage of react-router-dom history with useNavigate
JamieSlome Nov 7, 2023
832274d
chore: reconcile src/ui/services and VITE_API_URI env loading
JamieSlome Nov 7, 2023
bb60c65
chore: remove /api/v1 from user ui services
JamieSlome Nov 7, 2023
0b19e46
chore: reconcile login and open push requests views in src/ui/views
JamieSlome Nov 7, 2023
2a933e3
chore: reconcile src/ui/views lists with simpler design
JamieSlome Nov 7, 2023
8187de9
chore: simplify further src/ui/views lists
JamieSlome Nov 7, 2023
9c32fcd
chore: reconcile userlist.jsx in userlist component
JamieSlome Nov 7, 2023
c00b7b7
chore: remove deprecated NewUser component
JamieSlome Nov 7, 2023
db02ec2
chore: reconcile pushes table in src/ui/views
JamieSlome Nov 7, 2023
31fe1be
chore: remove unused Navigate in PushesTable
JamieSlome Nov 7, 2023
9952482
chore: reconcile repo details in src/ui/views
JamieSlome Nov 7, 2023
ef491e6
chore: reconcile new repositories and repository overview component
JamieSlome Nov 8, 2023
b2b51de
chore: add new repository component for creating repository record
JamieSlome Nov 8, 2023
72cfc61
chore: reconcile service routes except auth
JamieSlome Nov 15, 2023
5d1d505
chore: reconcile index.html in project root
JamieSlome Nov 15, 2023
195cf8f
chore: reconcile remaining ui/views
JamieSlome Dec 6, 2023
646cc37
Merge branch 'main' into reconcile
JamieSlome Jan 8, 2024
0648576
Merge branch 'main' into reconcile
JamieSlome Jan 8, 2024
71167b5
chore: update all mongo functions for database connector
JamieSlome Jan 8, 2024
d60f9e3
chore: update Action class definition to deprecate unused functions
JamieSlome Jan 8, 2024
23bdd89
chore: reconcile proxy index.js and chain.js with @coopernetes plugin…
JamieSlome Jan 8, 2024
347b656
chore: reconcile proxy/routes/index.js
JamieSlome Jan 8, 2024
f70d405
chore: reconcile proxy/processors/pre-processor
JamieSlome Jan 8, 2024
11af71d
chore: reconcile and push all push-action lambdas
JamieSlome Jan 8, 2024
7f57020
chore: fix const spelling mistake for mongoSession in mongo/helper.js
JamieSlome Jan 9, 2024
6186e90
chore: reconcile src/db/index.js
JamieSlome Jan 9, 2024
20c9061
chore: reconcile src/service/index.js
JamieSlome Jan 9, 2024
1a6d113
fix: replace usage of useHistory and Redirect with useNavigate and Na…
JamieSlome Jan 9, 2024
97cb775
Merge branch 'main' into reconcile
JamieSlome Jan 10, 2024
b326e26
chore: resolve code linting failure in CI
JamieSlome Jan 11, 2024
7e8806d
Merge branch 'main' into reconcile
JamieSlome Jan 26, 2024
848186e
chore: remove plaintext logging of user credentials (CodeQL spot)
JamieSlome Jan 26, 2024
08b3b6d
chore: install missing dependency express-mongodb-session
JamieSlome Jan 26, 2024
aed9e4e
Update src/proxy/processors/push-action/parsePush.js
JamieSlome Jan 26, 2024
744cec8
Update src/proxy/routes/index.js
JamieSlome Jan 26, 2024
51c2505
chore: remove checkTraining lambda reference due to undefined
JamieSlome Jan 26, 2024
4cc2da0
Merge branch 'reconcile' of https://github.com/finos/git-proxy into r…
JamieSlome Jan 26, 2024
9903517
Merge branch 'main' into reconcile
JamieSlome Feb 8, 2024
5ffdb80
Merge branch 'main' into reconcile
JamieSlome Feb 9, 2024
0c7004f
fix: re-attach file sink to sink loader
JamieSlome Feb 9, 2024
9f81370
chore: re-instate default repository loading
JamieSlome Feb 9, 2024
9175f5d
chore: update equality expression for default authorised repository list
JamieSlome Feb 9, 2024
4a82e6b
chore: remove self signed cert configuration option
JamieSlome Feb 9, 2024
bd4d0bb
chore: add latest config options to proxy.config.json
JamieSlome Feb 9, 2024
b3b5fa8
chore: add new config features and associated functions
JamieSlome Feb 9, 2024
0858219
feat: add email sender functionality with smtp host and port from config
JamieSlome Feb 9, 2024
dc887be
chore: reconcile src/service/passport and src/service/routes
JamieSlome Feb 13, 2024
d1d76af
chore: update get third party apis call to latest rename
JamieSlome Feb 13, 2024
f8f6a72
fix: update absolute build path to build instead of dist folder
JamieSlome Feb 13, 2024
c3bb9ba
test: update test api calls with /api
JamieSlome Feb 21, 2024
de1a54d
chore: only assign store value to session when database type is mongo
JamieSlome Feb 22, 2024
5aa904d
chore: fix calls to favicon.ico and manifest.json in index.html
JamieSlome Feb 22, 2024
7ae25ff
fix: remove concat of prop.layout and prop.path in admin.jsx @coopern…
JamieSlome Feb 26, 2024
1bbda77
fix: auth works now, after passing hashed password to db user creation
maoo Feb 27, 2024
b964ca4
fix: replace passwordhash with bcrypt
maoo Feb 27, 2024
7e0a54e
feat: add allow list on CVE scanning
maoo Feb 27, 2024
c5614ba
chore(deps): update codecov/codecov-action action to v4.0.2
renovate[bot] Feb 23, 2024
5813316
chore(deps): update codecov/codecov-action action to v4.1.0
renovate[bot] Feb 26, 2024
3a38dee
changed password hash to bcrypt fixes
singhotto Feb 28, 2024
77b2997
Merge branch 'finos:main' into fix/changed-password-hash-to-bcrypt
singhotto Feb 28, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .env.development
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
VITE_API_URI=http://localhost:8080
1 change: 1 addition & 0 deletions .env.production
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
VITE_API_URI=
40 changes: 0 additions & 40 deletions .eslintrc.cjs

This file was deleted.

40 changes: 40 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
"parser": "@babel/eslint-parser",
"env": {
"node": true,
"browser": true,
"commonjs": true,
"es2021": true,
"mocha": true
},
"extends": [
"eslint:recommended",
"plugin:react/recommended",
"google",
"prettier"
],
"overrides": [],
"parserOptions": {
"requireConfigFile": false,
"ecmaVersion": 12,
"sourceType": "module",
"ecmaFeatures": {
"jsx": true,
"modules": true
},
"babelOptions": {
"presets": ["@babel/preset-react"]
}
},
"plugins": ["react", "prettier"],
"rules": {
"react/prop-types": "off",
"require-jsdoc": "off",
"no-async-promise-executor": "off"
},
"settings": {
"react": {
"version": "detect"
}
}
}
8 changes: 8 additions & 0 deletions .github/allow-list.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"ignore": [
{
"id": "CVE-2023-42282",
"reason": "The version used for the ip library is 2.0.0, and CVE affects version 1.1.8 or earlier; false positive"
}
]
}
4 changes: 2 additions & 2 deletions .github/workflows/cve-scanning-node.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
paths:
- 'package.json'
- 'package-lock.json'
- 'allow-list.json'
- '.github/allow-list.json'
- '.github/workflows/cve-scanning-node.yml'

jobs:
Expand All @@ -23,4 +23,4 @@ jobs:
with:
node-version: ${{ matrix.node-version }}
- run: npm ci --prod
- run: npx --yes auditjs ossi --whitelist allow-list.json
- run: npx --yes auditjs ossi --whitelist .github/allow-list.json
26 changes: 13 additions & 13 deletions .github/workflows/license-validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ name: License Validation

on:
push:
branches: [ main ]
branches: [main]
pull_request:
branches: [ main ]
branches: [main]

jobs:
validate:
Expand All @@ -16,14 +16,14 @@ jobs:
matrix:
node-version: [18.x]
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
- name: Install node-license-validator
run: npm i -g node-license-validator
- name: Validate Server
run: |
npm install --prod
node-license-validator . --allow-licenses MIT Apache-2.0 BSD BSD-3-Clause ISC BSD-2-Clause Unlicense CC0-1.0 0BSD MIT/X11 MPL --allow-packages spdx-exceptions spdx-license-ids underscore precond password-hash
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
- name: Install node-license-validator
run: npm i -g node-license-validator
- name: Validate Server
run: |
npm install --prod
node-license-validator . --allow-licenses MIT Apache-2.0 BSD BSD-3-Clause ISC BSD-2-Clause Unlicense CC0-1.0 0BSD MIT/X11 MPL --allow-packages spdx-exceptions spdx-license-ids underscore precond
10 changes: 10 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"semi": true,
"tabWidth": 2,
"printWidth": 100,
"singleQuote": true,
"trailingComma": "all",
"jsxSingleQuote": true,
"bracketSpacing": true,
"arrowParens": "always"
}
25 changes: 11 additions & 14 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
{
"javascript.suggestionActions.enabled": false,
"editor.tabSize": 2,
"files.eol": "\n",
"terminal.integrated.disableLineWrapping": true,
"debug.console.wordWrap": false,
"editor.wordWrap": "off",
"editor.codeActionsOnSave": {
"source.fixAll": true
},
"eslint.validate": [
"javascript",
"javascriptreact",
]
}
"javascript.suggestionActions.enabled": false,
"editor.tabSize": 2,
"files.eol": "\n",
"debug.console.wordWrap": false,
"editor.wordWrap": "off",
"editor.codeActionsOnSave": {
"source.fixAll.eslint": true
},
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true
}
41 changes: 18 additions & 23 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,53 +18,48 @@
*/

-->
<!DOCTYPE html>
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8" />
<meta
name="viewport"
content="width=device-width, initial-scale=1, shrink-to-fit=no"
/>
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
<meta name="theme-color" content="#000000" />
<!--
manifest.json provides metadata used when your web app is added to the
homescreen on Android. See https://developers.google.com/web/fundamentals/engage-and-retain/web-app-manifest/
-->
<link rel="manifest" href="/manifest.json" />
<link rel="shortcut icon" href="/favicon.ico" />
<link
rel="apple-touch-icon"
sizes="76x76"
href="/apple-icon.png"
/>
<link
rel="stylesheet"
href="//cdn.jsdelivr.net/chartist.js/latest/chartist.min.css"
/>
<link rel="apple-touch-icon" sizes="76x76" href="/apple-icon.png" />
<link rel="stylesheet" href="//cdn.jsdelivr.net/chartist.js/latest/chartist.min.css" />

<script src="//cdn.jsdelivr.net/chartist.js/latest/chartist.min.js"></script>
<script
src="https://cdn.jsdelivr.net/chartist.js/0.11.0/chartist.min.js"
integrity="sha384-BnJvHBnDyKVZFn8I5i6LHXOscPlizGS+cgZi1crgdHmjU9lVKXwtNsqXQ521P++Z"
crossorigin="anonymous"
></script>
<link
rel="stylesheet"
href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700|Material+Icons"
/>
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet" />
<link
href="https://fonts.googleapis.com/icon?family=Material+Icons"
rel="stylesheet"
href="//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css"
/>

<link
rel="stylesheet"
href="//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css"
type="text/css"
href="https://cdn.jsdelivr.net/npm/diff2html/bundles/css/diff2html.min.css"
/>

<link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/npm/diff2html/bundles/css/diff2html.min.css" />

<!--
Notice the use of %PUBLIC_URL% in the tags above.
Notice the use of / in the tags above.
It will be replaced with the URL of the `public` folder during the build.
Only files inside the `public` folder can be referenced from the HTML.

Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
Unlike "/favicon.ico" or "favicon.ico", "//favicon.ico" will
work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`.
-->
Expand All @@ -73,7 +68,6 @@
<body>
<noscript> You need to enable JavaScript to run this app. </noscript>
<div id="root"></div>
<script type="module" src="/src/index.jsx"></script>
<!--
This HTML file is a template.
If you open it directly in the browser, you will see an empty page.
Expand All @@ -85,4 +79,5 @@
To create a production bundle, use `npm run build` or `yarn build`.
-->
</body>
</html>
<script type="module" src="/src/index.jsx"></script>
</html>
Loading