diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 64c8eaed87..fdad25a3cd 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -6,18 +6,18 @@ on:
branches:
- '**'
env:
- NODE_VERSION: 16.10.0
+ NODE_VERSION: 18.9.0
jobs:
check-ci:
name: Node Engine Check
timeout-minutes: 15
- runs-on: ubuntu-18.04
+ runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ env.NODE_VERSION }}
uses: actions/setup-node@v1
with:
- node-version: ${{ env.node-version }}
+ node-version: ${{ env.NODE_VERSION }}
- name: Cache Node.js modules
uses: actions/cache@v2
with:
@@ -32,13 +32,13 @@ jobs:
check-lint:
name: Lint
timeout-minutes: 15
- runs-on: ubuntu-18.04
+ runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ env.NODE_VERSION }}
uses: actions/setup-node@v1
with:
- node-version: ${{ env.node-version }}
+ node-version: ${{ env.NODE_VERSION }}
- name: Cache Node.js modules
uses: actions/cache@v2
with:
@@ -52,13 +52,13 @@ jobs:
check-circular:
name: Circular Dependencies
timeout-minutes: 5
- runs-on: ubuntu-18.04
+ runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ env.NODE_VERSION }}
uses: actions/setup-node@v1
with:
- node-version: ${{ env.node-version }}
+ node-version: ${{ env.NODE_VERSION }}
- name: Cache Node.js modules
uses: actions/cache@v2
with:
@@ -86,7 +86,7 @@ jobs:
fail-fast: false
name: ${{ matrix.name }}
timeout-minutes: 15
- runs-on: ubuntu-18.04
+ runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up QEMU
@@ -100,7 +100,7 @@ jobs:
check-lock-file-version:
name: NPM Lock File Version
timeout-minutes: 5
- runs-on: ubuntu-18.04
+ runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Check NPM lock file version
@@ -114,13 +114,15 @@ jobs:
- name: Node 12
NODE_VERSION: 12.22.12
- name: Node 14
- NODE_VERSION: 14.19.2
+ NODE_VERSION: 14.20.0
- name: Node 16
- NODE_VERSION: 16.10.0
+ NODE_VERSION: 16.17.0
+ - name: Node 18
+ NODE_VERSION: 18.9.0
fail-fast: false
name: ${{ matrix.name }}
timeout-minutes: 15
- runs-on: ubuntu-18.04
+ runs-on: ubuntu-latest
env:
NODE_VERSION: ${{ matrix.NODE_VERSION }}
steps:
diff --git a/.github/workflows/release-automated.yml b/.github/workflows/release-automated.yml
index f20761db87..a95ae9f746 100644
--- a/.github/workflows/release-automated.yml
+++ b/.github/workflows/release-automated.yml
@@ -38,7 +38,7 @@ jobs:
env:
REGISTRY: docker.io
IMAGE_NAME: parseplatform/parse-dashboard
- runs-on: ubuntu-18.04
+ runs-on: ubuntu-latest
permissions:
contents: read
packages: write
diff --git a/.github/workflows/release-manual-docker.yml b/.github/workflows/release-manual-docker.yml
index 9863468b73..99160e7b09 100644
--- a/.github/workflows/release-manual-docker.yml
+++ b/.github/workflows/release-manual-docker.yml
@@ -8,13 +8,13 @@ on:
inputs:
ref:
default: ''
- description: 'Reference (tag / SHA):'
+ description: 'Reference (tag / SHA):'
env:
REGISTRY: docker.io
IMAGE_NAME: parseplatform/parse-dashboard
jobs:
build:
- runs-on: ubuntu-18.04
+ runs-on: ubuntu-latest
permissions:
contents: read
packages: write
diff --git a/Parse-Dashboard/Authentication.js b/Parse-Dashboard/Authentication.js
index 6a859fa546..0a6beee442 100644
--- a/Parse-Dashboard/Authentication.js
+++ b/Parse-Dashboard/Authentication.js
@@ -30,13 +30,13 @@ function initialize(app, options) {
otpCode: req.body.otpCode
});
if (!match.matchingUsername) {
- return cb(null, false, { message: 'Invalid username or password' });
- }
- if (match.otpMissing) {
- return cb(null, false, { message: 'Please enter your one-time password.' });
+ return cb(null, false, { message: JSON.stringify({ text: 'Invalid username or password' }) });
}
if (!match.otpValid) {
- return cb(null, false, { message: 'Invalid one-time password.' });
+ return cb(null, false, { message: JSON.stringify({ text: 'Invalid one-time password.', otpLength: match.otpMissingLength || 6}) });
+ }
+ if (match.otpMissingLength) {
+ return cb(null, false, { message: JSON.stringify({ text: 'Please enter your one-time password.', otpLength: match.otpMissingLength || 6 })});
}
cb(null, match.matchingUsername);
})
@@ -91,7 +91,7 @@ function authenticate(userToTest, usernameOnly) {
let appsUserHasAccessTo = null;
let matchingUsername = null;
let isReadOnly = false;
- let otpMissing = false;
+ let otpMissingLength = false;
let otpValid = true;
//they provided auth
@@ -104,17 +104,20 @@ function authenticate(userToTest, usernameOnly) {
let usernameMatches = userToTest.name == user.user;
if (usernameMatches && user.mfa && !usernameOnly) {
if (!userToTest.otpCode) {
- otpMissing = true;
+ otpMissingLength = user.mfaDigits || 6;
} else {
const totp = new OTPAuth.TOTP({
algorithm: user.mfaAlgorithm || 'SHA1',
- secret: OTPAuth.Secret.fromBase32(user.mfa)
+ secret: OTPAuth.Secret.fromBase32(user.mfa),
+ digits: user.mfaDigits,
+ period: user.mfaPeriod,
});
const valid = totp.validate({
token: userToTest.otpCode
});
if (valid === null) {
otpValid = false;
+ otpMissingLength = user.mfaDigits || 6;
}
}
}
@@ -132,7 +135,7 @@ function authenticate(userToTest, usernameOnly) {
return {
isAuthenticated,
matchingUsername,
- otpMissing,
+ otpMissingLength,
otpValid,
appsUserHasAccessTo,
isReadOnly,
diff --git a/Parse-Dashboard/CLI/mfa.js b/Parse-Dashboard/CLI/mfa.js
index f862f2cf45..3f26a73a98 100644
--- a/Parse-Dashboard/CLI/mfa.js
+++ b/Parse-Dashboard/CLI/mfa.js
@@ -65,7 +65,19 @@ const generateSecret = ({ app, username, algorithm, digits, period }) => {
secret
});
const url = totp.toString();
- return { secret: secret.base32, url };
+ const config = { mfa: secret.base32 };
+ config.app = app;
+ config.url = url;
+ if (algorithm !== 'SHA1') {
+ config.mfaAlgorithm = algorithm;
+ }
+ if (digits != 6) {
+ config.mfaDigits = digits;
+ }
+ if (period != 30) {
+ config.mfaPeriod = period;
+ }
+ return { config };
};
const showQR = text => {
const QRCode = require('qrcode');
@@ -77,7 +89,10 @@ const showQR = text => {
});
};
-const showInstructions = ({ app, username, passwordCopied, secret, url, encrypt, config }) => {
+const showInstructions = ({ app, username, passwordCopied, encrypt, config }) => {
+ const {secret, url} = config;
+ const mfaJSON = {...config};
+ delete mfaJSON.url;
let orderCounter = 0;
const getOrder = () => {
orderCounter++;
@@ -90,7 +105,7 @@ const showInstructions = ({ app, username, passwordCopied, secret, url, encrypt,
console.log(
`\n${getOrder()}. Add the following settings for user "${username}" ${app ? `in app "${app}" ` : '' }to the Parse Dashboard configuration.` +
- `\n\n ${JSON.stringify(config)}`
+ `\n\n ${JSON.stringify(mfaJSON)}`
);
if (passwordCopied) {
@@ -101,14 +116,14 @@ const showInstructions = ({ app, username, passwordCopied, secret, url, encrypt,
if (secret) {
console.log(
- `\n${getOrder()}. Open the authenticator app to scan the QR code above or enter this secret code:` +
- `\n\n ${secret}` +
+ `\n${getOrder()}. Open the authenticator app to scan the QR code above or enter this secret code:` +
+ `\n\n ${secret}` +
'\n\n If the secret code generates incorrect one-time passwords, try this alternative:' +
- `\n\n ${url}` +
+ `\n\n ${url}` +
`\n\n${getOrder()}. Destroy any records of the QR code and the secret code to secure the account.`
);
}
-
+
if (encrypt) {
console.log(
`\n${getOrder()}. Make sure that "useEncryptedPasswords" is set to "true" in your dashboard configuration.` +
@@ -173,6 +188,7 @@ module.exports = {
const salt = bcrypt.genSaltSync(10);
data.pass = bcrypt.hashSync(data.pass, salt);
}
+ const config = {};
if (mfa) {
const { app } = await inquirer.prompt([
{
@@ -182,18 +198,13 @@ module.exports = {
}
]);
const { algorithm, digits, period } = await getAlgorithm();
- const { secret, url } = generateSecret({ app, username, algorithm, digits, period });
- data.mfa = secret;
- data.app = app;
- data.url = url;
- if (algorithm !== 'SHA1') {
- data.mfaAlgorithm = algorithm;
- }
- showQR(data.url);
+ const secret =generateSecret({ app, username, algorithm, digits, period });
+ Object.assign(config, secret.config);
+ showQR(secret.config.url);
}
-
- const config = { mfa: data.mfa, user: data.user, pass: data.pass };
- showInstructions({ app: data.app, username, passwordCopied: true, secret: data.mfa, url: data.url, encrypt, config });
+ config.user = data.user;
+ config.pass = data.pass ;
+ showInstructions({ app: data.app, username, passwordCopied: true, encrypt, config });
},
async createMFA() {
console.log('');
@@ -212,14 +223,9 @@ module.exports = {
]);
const { algorithm, digits, period } = await getAlgorithm();
- const { url, secret } = generateSecret({ app, username, algorithm, digits, period });
- showQR(url);
-
+ const { config } = generateSecret({ app, username, algorithm, digits, period });
+ showQR(config.url);
// Compose config
- const config = { mfa: secret };
- if (algorithm !== 'SHA1') {
- config.mfaAlgorithm = algorithm;
- }
- showInstructions({ app, username, secret, url, config });
+ showInstructions({ app, username, config });
}
};
diff --git a/Parse-Dashboard/app.js b/Parse-Dashboard/app.js
index 7af0fb2db5..0149b8c634 100644
--- a/Parse-Dashboard/app.js
+++ b/Parse-Dashboard/app.js
@@ -184,22 +184,22 @@ module.exports = function(config, options) {
`
}
res.send(`
+
-
-
Parse Dashboard
-
-
- ${errors}
-
-
-
-
+
+
+
+ ${errors}
+
+
+
+