From 433f0acf3c08e85b7377975555edf0e6511e23e6 Mon Sep 17 00:00:00 2001 From: Peter Mescalchin Date: Sat, 5 Jun 2021 15:11:53 +1000 Subject: [PATCH 01/13] fix broken links to download KeeWeb Connect browser extension due to incorrect const/Links property --- app/scripts/views/settings/settings-browser-view.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/scripts/views/settings/settings-browser-view.js b/app/scripts/views/settings/settings-browser-view.js index 4ab170aa..29c6cb80 100644 --- a/app/scripts/views/settings/settings-browser-view.js +++ b/app/scripts/views/settings/settings-browser-view.js @@ -57,7 +57,7 @@ class SettingsBrowserView extends View { } else { const extensionBrowserFamily = Features.extensionBrowserFamily; data.extensionBrowserFamily = Features.extensionBrowserFamily; - data.extensionDownloadLink = Links[`KeeWebConnectFor${extensionBrowserFamily}`]; + data.extensionDownloadLink = Links[`KWCFor${extensionBrowserFamily}`]; } super.render(data); } From dcbe8d70da88d89b4b50cf364c9d16a62f062c51 Mon Sep 17 00:00:00 2001 From: antelle Date: Mon, 10 May 2021 18:12:11 +0200 Subject: [PATCH 02/13] fixed donate button border --- app/styles/areas/_settings.scss | 9 ++++++++- app/templates/settings/settings-about.hbs | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/app/styles/areas/_settings.scss b/app/styles/areas/_settings.scss index 7fae5554..2101c45e 100644 --- a/app/styles/areas/_settings.scss +++ b/app/styles/areas/_settings.scss @@ -334,8 +334,11 @@ } } &__donate-btn { + $donate-border-color: #89abed; + background: #fff; - border: 2px solid #89abed; + border: 2px solid $donate-border-color; + border-bottom: 2px solid $donate-border-color; border-radius: 2.8rem; text-align: center; display: inline-block; @@ -345,6 +348,10 @@ height: 2.8rem; margin-bottom: $base-padding-v * 2; + &:hover { + border-bottom: 2px solid $donate-border-color; + } + &-top, &-bottom { pointer-events: none; diff --git a/app/templates/settings/settings-about.hbs b/app/templates/settings/settings-about.hbs index 6414dfca..358f2dff 100644 --- a/app/templates/settings/settings-about.hbs +++ b/app/templates/settings/settings-about.hbs @@ -3,7 +3,7 @@

{{#res 'setAboutFirst'}}Antelle{{/res~}}  {{~#res 'setAboutSecond'}}MIT{{/res}} {{#res 'setAboutSource'}}GitHub {{/res}}

- + Become aBacker

{{res 'setAboutBuilt'}}:

From 98268f21c07eb65cb1ade333c70e6280ede5547d Mon Sep 17 00:00:00 2001 From: Saulo Alves Date: Sun, 11 Jul 2021 00:56:51 +0200 Subject: [PATCH 03/13] added teams storage; added tenant id configuration for onedrive and teams --- app/content/oauth-result/teams.html | 16 + app/scripts/const/default-app-settings.js | 8 +- app/scripts/locales/base.json | 1 + app/scripts/storage/impl/storage-onedrive.js | 14 +- app/scripts/storage/impl/storage-teams.js | 372 +++++++++++++++++++ app/scripts/storage/index.js | 2 + app/styles/base/_icon-font.scss | 1 + 7 files changed, 408 insertions(+), 6 deletions(-) create mode 100644 app/content/oauth-result/teams.html create mode 100644 app/scripts/storage/impl/storage-teams.js diff --git a/app/content/oauth-result/teams.html b/app/content/oauth-result/teams.html new file mode 100644 index 00000000..a07583e8 --- /dev/null +++ b/app/content/oauth-result/teams.html @@ -0,0 +1,16 @@ + + + + + KeeWeb + + + + + diff --git a/app/scripts/const/default-app-settings.js b/app/scripts/const/default-app-settings.js index 63df7bb6..eb0b1d4a 100644 --- a/app/scripts/const/default-app-settings.js +++ b/app/scripts/const/default-app-settings.js @@ -87,7 +87,13 @@ const DefaultAppSettings = { onedrive: true, // enable OneDrive integration onedriveClientId: null, // custom OneDrive client id - onedriveClientSecret: null // custom OneDrive client secret + onedriveClientSecret: null, // custom OneDrive client secret + onedriveTenantId: null, // custom OneDrive tenant id + + teams: true, // enable Teams integration + teamsClientId: null, // custom Teams client id + teamsClientSecret: null, // custom Teams client secret + teamsTenantId: null // custom Teams tenant id }; export { DefaultAppSettings }; diff --git a/app/scripts/locales/base.json b/app/scripts/locales/base.json index da4c2812..608d97e4 100644 --- a/app/scripts/locales/base.json +++ b/app/scripts/locales/base.json @@ -43,6 +43,7 @@ "dropbox": "Dropbox", "gdrive": "Google Drive", "onedrive": "OneDrive", + "teams": "Teams", "menuAllItems": "All Items", "menuColors": "Colors", "menuTrash": "Trash", diff --git a/app/scripts/storage/impl/storage-onedrive.js b/app/scripts/storage/impl/storage-onedrive.js index c96b0baf..46ab9a8d 100644 --- a/app/scripts/storage/impl/storage-onedrive.js +++ b/app/scripts/storage/impl/storage-onedrive.js @@ -221,22 +221,26 @@ class StorageOneDrive extends StorageBase { _getOAuthConfig() { let clientId = this.appSettings.onedriveClientId; let clientSecret = this.appSettings.onedriveClientSecret; + let tenant = this.appSettings.onedriveTenantId; + if (!clientId) { if (Features.isDesktop) { - ({ id: clientId, secret: clientSecret } = OneDriveApps.Desktop); + ({ id: clientId, secret: clientSecret, tenantId: tenant } = OneDriveApps.Desktop); } else if (Features.isLocal) { - ({ id: clientId, secret: clientSecret } = OneDriveApps.Local); + ({ id: clientId, secret: clientSecret, tenantId: tenant } = OneDriveApps.Local); } else { - ({ id: clientId, secret: clientSecret } = OneDriveApps.Production); + ({ id: clientId, secret: clientSecret, tenantId: tenant } = OneDriveApps.Production); } } + tenant = tenant || 'common'; + let scope = 'files.readwrite'; if (!this.appSettings.shortLivedStorageToken) { scope += ' offline_access'; } return { - url: 'https://login.microsoftonline.com/common/oauth2/v2.0/authorize', - tokenUrl: 'https://login.microsoftonline.com/common/oauth2/v2.0/token', + url: `https://login.microsoftonline.com/${tenant}/oauth2/v2.0/authorize`, + tokenUrl: `https://login.microsoftonline.com/${tenant}/oauth2/v2.0/token`, scope, clientId, clientSecret, diff --git a/app/scripts/storage/impl/storage-teams.js b/app/scripts/storage/impl/storage-teams.js new file mode 100644 index 00000000..861486b0 --- /dev/null +++ b/app/scripts/storage/impl/storage-teams.js @@ -0,0 +1,372 @@ +import { StorageBase } from 'storage/storage-base'; +import { TeamsApps } from 'const/cloud-storage-apps'; +import { Features } from 'util/features'; + +// https://docs.microsoft.com/en-us/azure/active-directory/develop/v2-oauth2-auth-code-flow + +// https://graph.microsoft.com/v1.0/me/transitiveMemberOf/microsoft.graph.group?$count=true +// https://graph.microsoft.com/v1.0/groups?$filter=groupTypes/any(c:c+eq+'Unified') +// https://graph.microsoft.com/v1.0/groups?$filter=groupTypes/any(c:c+eq+'Unified')&$orderby=displayName +// https://graph.microsoft.com/v1.0/groups?$orderby=displayName +// /me/joinedTeams +// https://graph.microsoft.com/v1.0/groups/{group id}/drive/root/children + +class StorageTeams extends StorageBase { + name = 'teams'; + enabled = true; + uipos = 50; + icon = 'user-friends'; + + _graphUrl = 'https://graph.microsoft.com/v1.0'; + _groupsUrl = `${this._graphUrl}/me/joinedTeams`; + _baseUrl = `${this._graphUrl}/groups`; + + getPathForName(fileName) { + return '/drive/root:/' + fileName + '.kdbx'; + } + + genUrlAddress(groupId, path) { + if (groupId) { + return this._baseUrl + '/' + groupId + (path ? '/' + path.replace(/^\/+/, '') : ''); + } else { + return this._groupsUrl; + } + } + + genUrl(path) { + // console.warn('genUrl', path); + if (!path) { + const groupId = null; + const dir = null; + const url = this.genUrlAddress(groupId, dir); + return [groupId, dir, url]; + } + + const parts = path.replace(/^\/+/, '').split('/'); + if (parts.length === 0) { + const groupId = null; + const dir = null; + const url = this.genUrlAddress(groupId, dir); + return [groupId, dir, url]; + } else if (parts.length === 1) { + const groupId = parts[0]; + const dir = null; + const url = this.genUrlAddress(groupId, dir); + return [groupId, dir, url]; + } else { + path = path.replace(/\/drive\/root\:/, ''); + const groupId = parts[0]; + const dir = ('/' + parts.slice(1).join('/')).replace(/^\/+/, ''); + const url = this.genUrlAddress(groupId, dir); + return [groupId, dir, url]; + } + } + + load(path, opts, callback) { + this._oauthAuthorize((err) => { + if (err) { + return callback && callback(err); + } + this.logger.debug('Load', path); + const ts = this.logger.ts(); + + const urlParts = this.genUrl(path); + const groupId = urlParts[0]; + path = urlParts[1]; + const url = urlParts[2]; + if (!groupId) { + const err = 'no group id defined'; + return callback && callback(err); + } + + this._xhr({ + url, + responseType: 'json', + success: (response) => { + const downloadUrl = response['@microsoft.graph.downloadUrl']; + let rev = response.eTag; + if (!downloadUrl || !response.eTag) { + this.logger.debug( + 'Load error', + path, + 'no download url', + response, + this.logger.ts(ts) + ); + return callback && callback('no download url'); + } + this._xhr({ + url: downloadUrl, + responseType: 'arraybuffer', + skipAuth: true, + success: (response, xhr) => { + rev = xhr.getResponseHeader('ETag') || rev; + this.logger.debug('Loaded', path, rev, this.logger.ts(ts)); + return callback && callback(null, response, { rev }); + }, + error: (err) => { + this.logger.error('Load error', path, err, this.logger.ts(ts)); + return callback && callback(err); + } + }); + }, + error: (err) => { + this.logger.error('Load error', path, err, this.logger.ts(ts)); + return callback && callback(err); + } + }); + }); + } + + stat(path, opts, callback) { + this._oauthAuthorize((err) => { + if (err) { + return callback && callback(err); + } + this.logger.debug('Stat', path); + const ts = this.logger.ts(); + + const urlParts = this.genUrl(path); + const groupId = urlParts[0]; + path = urlParts[1]; + const url = urlParts[2]; + if (!groupId) { + const err = 'no group id defined'; + return callback && callback(err); + } + + this._xhr({ + url, + responseType: 'json', + success: (response) => { + const rev = response.eTag; + if (!rev) { + this.logger.error('Stat error', path, 'no eTag', this.logger.ts(ts)); + return callback && callback('no eTag'); + } + this.logger.debug('Stated', path, rev, this.logger.ts(ts)); + return callback && callback(null, { rev }); + }, + error: (err, xhr) => { + if (xhr.status === 404) { + this.logger.debug('Stated not found', path, this.logger.ts(ts)); + return callback && callback({ notFound: true }); + } + this.logger.error('Stat error', path, err, this.logger.ts(ts)); + return callback && callback(err); + } + }); + }); + } + + save(path, opts, data, callback, rev) { + this._oauthAuthorize((err) => { + if (err) { + return callback && callback(err); + } + this.logger.debug('Save', path, rev); + const ts = this.logger.ts(); + + const urlParts = this.genUrl(path); + const groupId = urlParts[0]; + path = urlParts[1]; + const url = urlParts[2] + ':/content'; + if (!groupId) { + const err = 'no group id defined'; + return callback && callback(err); + } + + this._xhr({ + url, + method: 'PUT', + responseType: 'json', + headers: rev ? { 'If-Match': rev } : null, + data, + statuses: [200, 201, 412], + success: (response, xhr) => { + rev = response.eTag; + if (!rev) { + this.logger.error('Save error', path, 'no eTag', this.logger.ts(ts)); + return callback && callback('no eTag'); + } + if (xhr.status === 412) { + this.logger.debug('Save conflict', path, rev, this.logger.ts(ts)); + return callback && callback({ revConflict: true }, { rev }); + } + this.logger.debug('Saved', path, rev, this.logger.ts(ts)); + return callback && callback(null, { rev }); + }, + error: (err) => { + this.logger.error('Save error', path, err, this.logger.ts(ts)); + return callback && callback(err); + } + }); + }); + } + + list(dir, callback) { + this._oauthAuthorize((err) => { + if (err) { + return callback && callback(err); + } + this.logger.debug('List', dir); + const ts = this.logger.ts(); + + // console.warn('dir ', dir); + const urlParts = this.genUrl(dir); + const groupId = urlParts[0]; + dir = urlParts[1]; + const urlPath = groupId ? (dir ? ':/children' : '/drive/root/children') : ''; + const url = urlParts[2] + urlPath; + // console.warn('urlParts', urlParts); + // console.warn('groupId ', groupId); + // console.warn('dir ', dir); + // console.warn('urlPath ', urlPath); + // console.warn('url ', url); + + const self = this; + self._groupId = groupId; + + this._xhr({ + url, + responseType: 'json', + success: (response) => { + if (!response || !response.value) { + this.logger.error('List error', this.logger.ts(ts), response); + return callback && callback('list error'); + } + this.logger.debug('Listed', this.logger.ts(ts)); + let fileList; + if (!self._groupId) { + fileList = response.value + .filter((f) => f.displayName) + .map((f) => ({ + name: f.displayName, + path: '/' + f.id, + rev: f.id, + dir: true + })); + } else { + fileList = response.value + .filter((f) => f.name) + .map((f) => ({ + name: f.name, + path: `/${self._groupId}${f.parentReference.path}/${f.name}`, + rev: f.eTag, + dir: !!f.folder + })); + } + return callback && callback(null, fileList); + }, + error: (err) => { + this.logger.error('List error', this.logger.ts(ts), err); + return callback && callback(err); + } + }); + }); + } + + remove(path, callback) { + this.logger.debug('Remove', path); + const ts = this.logger.ts(); + + const urlParts = this.genUrl(path); + const groupId = urlParts[0]; + path = urlParts[1]; + const url = urlParts[2]; + if (!groupId) { + const err = 'no group id defined'; + return callback && callback(err); + } + + this._xhr({ + url, + method: 'DELETE', + responseType: 'json', + statuses: [200, 204], + success: () => { + this.logger.debug('Removed', path, this.logger.ts(ts)); + return callback && callback(); + }, + error: (err) => { + this.logger.error('Remove error', path, err, this.logger.ts(ts)); + return callback && callback(err); + } + }); + } + + mkdir(path, callback) { + this._oauthAuthorize((err) => { + if (err) { + return callback && callback(err); + } + this.logger.debug('Make dir', path); + const ts = this.logger.ts(); + + const urlParts = this.genUrl(path); + const groupId = urlParts[0]; + path = urlParts[1]; + const url = urlParts[2] + '/drive/root/children'; + if (!groupId) { + const err = 'no group id defined'; + return callback && callback(err); + } + + const data = JSON.stringify({ name: path.replace('/drive/root:/', ''), folder: {} }); + this._xhr({ + url, + method: 'POST', + responseType: 'json', + statuses: [200, 204], + data, + dataType: 'application/json', + success: () => { + this.logger.debug('Made dir', path, this.logger.ts(ts)); + return callback && callback(); + }, + error: (err) => { + this.logger.error('Make dir error', path, err, this.logger.ts(ts)); + return callback && callback(err); + } + }); + }); + } + + logout(enabled) { + this._oauthRevokeToken(); + } + + _getOAuthConfig() { + let clientId = this.appSettings.teamsClientId; + let clientSecret = this.appSettings.teamsClientSecret; + let tenant = this.appSettings.teamsTenantId; + + if (!clientId) { + if (Features.isDesktop) { + ({ id: clientId, secret: clientSecret, tenantId: tenant } = TeamsApps.Desktop); + } else if (Features.isLocal) { + ({ id: clientId, secret: clientSecret, tenantId: tenant } = TeamsApps.Local); + } else { + ({ id: clientId, secret: clientSecret, tenantId: tenant } = TeamsApps.Production); + } + } + tenant = tenant || 'common'; + + let scope = 'Sites.ReadWrite.All Team.ReadBasic.All'; + if (!this.appSettings.shortLivedStorageToken) { + scope += ' offline_access'; + } + return { + url: `https://login.microsoftonline.com/${tenant}/oauth2/v2.0/authorize`, + tokenUrl: `https://login.microsoftonline.com/${tenant}/oauth2/v2.0/token`, + scope, + clientId, + clientSecret, + pkce: true, + width: 600, + height: 500 + }; + } +} + +export { StorageTeams }; diff --git a/app/scripts/storage/index.js b/app/scripts/storage/index.js index 3b323174..b6ed5ac8 100644 --- a/app/scripts/storage/index.js +++ b/app/scripts/storage/index.js @@ -5,6 +5,7 @@ import { StorageFile } from 'storage/impl/storage-file'; import { StorageFileCache } from 'storage/impl/storage-file-cache'; import { StorageGDrive } from 'storage/impl/storage-gdrive'; import { StorageOneDrive } from 'storage/impl/storage-onedrive'; +import { StorageTeams } from 'storage/impl/storage-teams'; import { StorageWebDav } from 'storage/impl/storage-webdav'; import { createOAuthSession } from 'storage/pkce'; @@ -17,6 +18,7 @@ const ThirdPartyStorage = { dropbox: new StorageDropbox(), gdrive: new StorageGDrive(), onedrive: new StorageOneDrive(), + teams: new StorageTeams(), webdav: new StorageWebDav() }; diff --git a/app/styles/base/_icon-font.scss b/app/styles/base/_icon-font.scss index ea92578a..2beaa553 100644 --- a/app/styles/base/_icon-font.scss +++ b/app/styles/base/_icon-font.scss @@ -82,6 +82,7 @@ $fa-var-file-image: next-fa-glyph(); $fa-var-file-video: next-fa-glyph(); $fa-var-file-audio: next-fa-glyph(); $fa-var-onedrive: next-fa-glyph(); +$fa-var-user-friends: next-fa-glyph(); $fa-var-question: next-fa-glyph(); $fa-var-sign-out-alt: next-fa-glyph(); $fa-var-sync-alt: next-fa-glyph(); From f8af64e45b2e136d9b97eadb315563ebae7c1658 Mon Sep 17 00:00:00 2001 From: Saulo Alves Date: Sun, 11 Jul 2021 10:52:40 +0200 Subject: [PATCH 04/13] renamed teams to microsoft teams; fixed grunt prettier error in onedrive --- app/scripts/locales/base.json | 2 +- app/scripts/storage/impl/storage-onedrive.js | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/scripts/locales/base.json b/app/scripts/locales/base.json index 608d97e4..a23691d3 100644 --- a/app/scripts/locales/base.json +++ b/app/scripts/locales/base.json @@ -43,7 +43,7 @@ "dropbox": "Dropbox", "gdrive": "Google Drive", "onedrive": "OneDrive", - "teams": "Teams", + "teams": "Microsoft Teams", "menuAllItems": "All Items", "menuColors": "Colors", "menuTrash": "Trash", diff --git a/app/scripts/storage/impl/storage-onedrive.js b/app/scripts/storage/impl/storage-onedrive.js index 46ab9a8d..c83b6ffe 100644 --- a/app/scripts/storage/impl/storage-onedrive.js +++ b/app/scripts/storage/impl/storage-onedrive.js @@ -229,7 +229,11 @@ class StorageOneDrive extends StorageBase { } else if (Features.isLocal) { ({ id: clientId, secret: clientSecret, tenantId: tenant } = OneDriveApps.Local); } else { - ({ id: clientId, secret: clientSecret, tenantId: tenant } = OneDriveApps.Production); + ({ + id: clientId, + secret: clientSecret, + tenantId: tenant + } = OneDriveApps.Production); } } tenant = tenant || 'common'; From 208a1b551e5c08ae5f34571c3e63f2eea93b9766 Mon Sep 17 00:00:00 2001 From: antelle Date: Sun, 11 Jul 2021 16:22:38 +0200 Subject: [PATCH 05/13] renames some ms teams constants --- app/scripts/const/default-app-settings.js | 8 ++++---- app/scripts/locales/base.json | 2 +- app/scripts/storage/impl/storage-teams.js | 15 ++++----------- app/scripts/storage/index.js | 2 +- 4 files changed, 10 insertions(+), 17 deletions(-) diff --git a/app/scripts/const/default-app-settings.js b/app/scripts/const/default-app-settings.js index eb0b1d4a..7afc88c3 100644 --- a/app/scripts/const/default-app-settings.js +++ b/app/scripts/const/default-app-settings.js @@ -90,10 +90,10 @@ const DefaultAppSettings = { onedriveClientSecret: null, // custom OneDrive client secret onedriveTenantId: null, // custom OneDrive tenant id - teams: true, // enable Teams integration - teamsClientId: null, // custom Teams client id - teamsClientSecret: null, // custom Teams client secret - teamsTenantId: null // custom Teams tenant id + msteams: false, // enable Microsoft Teams integration + msteamsClientId: null, // custom Microsoft Teams client id + msteamsClientSecret: null, // custom Microsoft Teams client secret + msteamsTenantId: null // custom Microsoft Teams tenant id }; export { DefaultAppSettings }; diff --git a/app/scripts/locales/base.json b/app/scripts/locales/base.json index a23691d3..d3f8c807 100644 --- a/app/scripts/locales/base.json +++ b/app/scripts/locales/base.json @@ -43,7 +43,7 @@ "dropbox": "Dropbox", "gdrive": "Google Drive", "onedrive": "OneDrive", - "teams": "Microsoft Teams", + "msteams": "Microsoft Teams", "menuAllItems": "All Items", "menuColors": "Colors", "menuTrash": "Trash", diff --git a/app/scripts/storage/impl/storage-teams.js b/app/scripts/storage/impl/storage-teams.js index 861486b0..1359757e 100644 --- a/app/scripts/storage/impl/storage-teams.js +++ b/app/scripts/storage/impl/storage-teams.js @@ -12,7 +12,7 @@ import { Features } from 'util/features'; // https://graph.microsoft.com/v1.0/groups/{group id}/drive/root/children class StorageTeams extends StorageBase { - name = 'teams'; + name = 'msteams'; enabled = true; uipos = 50; icon = 'user-friends'; @@ -34,7 +34,6 @@ class StorageTeams extends StorageBase { } genUrl(path) { - // console.warn('genUrl', path); if (!path) { const groupId = null; const dir = null; @@ -212,17 +211,11 @@ class StorageTeams extends StorageBase { this.logger.debug('List', dir); const ts = this.logger.ts(); - // console.warn('dir ', dir); const urlParts = this.genUrl(dir); const groupId = urlParts[0]; dir = urlParts[1]; const urlPath = groupId ? (dir ? ':/children' : '/drive/root/children') : ''; const url = urlParts[2] + urlPath; - // console.warn('urlParts', urlParts); - // console.warn('groupId ', groupId); - // console.warn('dir ', dir); - // console.warn('urlPath ', urlPath); - // console.warn('url ', url); const self = this; self._groupId = groupId; @@ -337,9 +330,9 @@ class StorageTeams extends StorageBase { } _getOAuthConfig() { - let clientId = this.appSettings.teamsClientId; - let clientSecret = this.appSettings.teamsClientSecret; - let tenant = this.appSettings.teamsTenantId; + let clientId = this.appSettings.msteamsClientId; + let clientSecret = this.appSettings.msteamsClientSecret; + let tenant = this.appSettings.msteamsTenantId; if (!clientId) { if (Features.isDesktop) { diff --git a/app/scripts/storage/index.js b/app/scripts/storage/index.js index b6ed5ac8..9e7f55c4 100644 --- a/app/scripts/storage/index.js +++ b/app/scripts/storage/index.js @@ -18,7 +18,7 @@ const ThirdPartyStorage = { dropbox: new StorageDropbox(), gdrive: new StorageGDrive(), onedrive: new StorageOneDrive(), - teams: new StorageTeams(), + msteams: new StorageTeams(), webdav: new StorageWebDav() }; From 062ddb3f729c3f4a876451940f18cb195a68bdff Mon Sep 17 00:00:00 2001 From: antelle Date: Tue, 13 Jul 2021 19:04:27 +0200 Subject: [PATCH 06/13] added MS Teams apps --- app/scripts/const/cloud-storage-apps.js | 15 ++++++++++++++- app/scripts/storage/impl/storage-teams.js | 2 +- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/app/scripts/const/cloud-storage-apps.js b/app/scripts/const/cloud-storage-apps.js index c5755e26..fb6aa660 100644 --- a/app/scripts/const/cloud-storage-apps.js +++ b/app/scripts/const/cloud-storage-apps.js @@ -37,4 +37,17 @@ const OneDriveApps = { } }; -export { DropboxApps, GDriveApps, OneDriveApps }; +const MsTeamsApps = { + Local: { + id: '8fbe2245-13d5-446f-bedc-74c3b2e1f635' + }, + Production: { + id: '8fbe2245-13d5-446f-bedc-74c3b2e1f635' + }, + Desktop: { + id: '8fbe2245-13d5-446f-bedc-74c3b2e1f635', + secret: 'F02~HYaWs-~7MndJcVRtv9~h-50Brk_9ho' + } +}; + +export { DropboxApps, GDriveApps, OneDriveApps, MsTeamsApps }; diff --git a/app/scripts/storage/impl/storage-teams.js b/app/scripts/storage/impl/storage-teams.js index 1359757e..a65c6e3d 100644 --- a/app/scripts/storage/impl/storage-teams.js +++ b/app/scripts/storage/impl/storage-teams.js @@ -1,5 +1,5 @@ import { StorageBase } from 'storage/storage-base'; -import { TeamsApps } from 'const/cloud-storage-apps'; +import { MsTeamsApps } from 'const/cloud-storage-apps'; import { Features } from 'util/features'; // https://docs.microsoft.com/en-us/azure/active-directory/develop/v2-oauth2-auth-code-flow From f0bb3824499e8aa5aefb5db4cc9348be988ee3c2 Mon Sep 17 00:00:00 2001 From: antelle Date: Tue, 13 Jul 2021 19:05:25 +0200 Subject: [PATCH 07/13] fixed variable usage --- app/scripts/storage/impl/storage-teams.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/scripts/storage/impl/storage-teams.js b/app/scripts/storage/impl/storage-teams.js index a65c6e3d..d30de541 100644 --- a/app/scripts/storage/impl/storage-teams.js +++ b/app/scripts/storage/impl/storage-teams.js @@ -336,11 +336,11 @@ class StorageTeams extends StorageBase { if (!clientId) { if (Features.isDesktop) { - ({ id: clientId, secret: clientSecret, tenantId: tenant } = TeamsApps.Desktop); + ({ id: clientId, secret: clientSecret, tenantId: tenant } = MsTeamsApps.Desktop); } else if (Features.isLocal) { - ({ id: clientId, secret: clientSecret, tenantId: tenant } = TeamsApps.Local); + ({ id: clientId, secret: clientSecret, tenantId: tenant } = MsTeamsApps.Local); } else { - ({ id: clientId, secret: clientSecret, tenantId: tenant } = TeamsApps.Production); + ({ id: clientId, secret: clientSecret, tenantId: tenant } = MsTeamsApps.Production); } } tenant = tenant || 'common'; From 9b2c40a07831dab2f426741585f5b5d5e02e1a21 Mon Sep 17 00:00:00 2001 From: antelle Date: Sun, 18 Jul 2021 16:01:53 +0200 Subject: [PATCH 08/13] added yubikeys code logging --- app/scripts/comp/app/yubikey.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/scripts/comp/app/yubikey.js b/app/scripts/comp/app/yubikey.js index 2e36e64c..ac92d17c 100644 --- a/app/scripts/comp/app/yubikey.js +++ b/app/scripts/comp/app/yubikey.js @@ -209,6 +209,10 @@ const YubiKey = { complete: (err, stdout) => { this.process = null; + if (window.debugYubiKey) { + logger.info('received codes', err, stdout); + } + if (this.aborted) { return callback('Aborted'); } From 29ae7e8ed24231312ddd4fd330d5000411bc1891 Mon Sep 17 00:00:00 2001 From: antelle Date: Sun, 18 Jul 2021 16:04:48 +0200 Subject: [PATCH 09/13] fix #1845: fixed an error during writing to closed socket --- desktop/scripts/ipc-handlers/browser-extension-connector.js | 6 +++++- release-notes.md | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/desktop/scripts/ipc-handlers/browser-extension-connector.js b/desktop/scripts/ipc-handlers/browser-extension-connector.js index 70d6b09d..dce1ac26 100644 --- a/desktop/scripts/ipc-handlers/browser-extension-connector.js +++ b/desktop/scripts/ipc-handlers/browser-extension-connector.js @@ -398,7 +398,11 @@ function sendMessageToSocket(socket, message) { const lengthBytes = Buffer.from(lengthBuf); const data = Buffer.concat([lengthBytes, responseData]); - socket.write(data); + try { + socket.write(data); + } catch (e) { + logger.error(`Error writing to socket ${state.socketId}`, e); + } } function sendToRenderer(event, socketId, data) { diff --git a/release-notes.md b/release-notes.md index d44133ab..d21df561 100644 --- a/release-notes.md +++ b/release-notes.md @@ -1,5 +1,8 @@ Release notes ------------- +##### v1.18.7 (2021-07-18) +`-` fix #1845: fixed a visible crash on socket write error + ##### v1.18.6 (2021-05-19) `-` fix #1824: saving KDBX3 files with compression disabled `-` fix #1818: extension connection error if browser cannot be identified From bf0e94582d5d156801b65d72fa42bc8d36c027ef Mon Sep 17 00:00:00 2001 From: antelle Date: Sun, 18 Jul 2021 16:05:25 +0200 Subject: [PATCH 10/13] release notes --- release-notes.md | 1 + 1 file changed, 1 insertion(+) diff --git a/release-notes.md b/release-notes.md index d21df561..ab569e4e 100644 --- a/release-notes.md +++ b/release-notes.md @@ -1,6 +1,7 @@ Release notes ------------- ##### v1.18.7 (2021-07-18) +`+` added an option to diagnose YubiKey code listing issues `-` fix #1845: fixed a visible crash on socket write error ##### v1.18.6 (2021-05-19) From 1673580dfabdf1eef2b17d7d37bfb335d1695804 Mon Sep 17 00:00:00 2001 From: antelle Date: Sun, 18 Jul 2021 16:05:39 +0200 Subject: [PATCH 11/13] bump version --- desktop/package.json | 2 +- package-lock.json | 2 +- package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/desktop/package.json b/desktop/package.json index 262c40ca..67954f42 100644 --- a/desktop/package.json +++ b/desktop/package.json @@ -1,6 +1,6 @@ { "name": "KeeWeb", - "version": "1.18.6", + "version": "1.18.7", "description": "Free cross-platform password manager compatible with KeePass", "main": "main.js", "homepage": "https://keeweb.info", diff --git a/package-lock.json b/package-lock.json index c51b74db..ed0d4e4b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "keeweb", - "version": "1.18.6", + "version": "1.18.7", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/package.json b/package.json index b1763338..bd7cb56c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "keeweb", - "version": "1.18.6", + "version": "1.18.7", "description": "Free cross-platform password manager compatible with KeePass", "main": "Gruntfile.js", "private": true, From 93cee76b4fd4e9b80ab037dc1b7f84cf9adfdeaa Mon Sep 17 00:00:00 2001 From: antelle Date: Sun, 18 Jul 2021 16:09:59 +0200 Subject: [PATCH 12/13] up translations --- app/scripts/locales/fr-FR.json | 83 ++++++++++++++++++++++++++++++++-- 1 file changed, 79 insertions(+), 4 deletions(-) diff --git a/app/scripts/locales/fr-FR.json b/app/scripts/locales/fr-FR.json index f4872eba..628b9aed 100644 --- a/app/scripts/locales/fr-FR.json +++ b/app/scripts/locales/fr-FR.json @@ -14,6 +14,7 @@ "or": "ou", "history": "historique", "template": "modèle", + "templates": "templates", "notImplemented": "Non Implémenté", "saveChanges": "Sauvegarder les modifications", "discardChanges": "Annuler les modifications", @@ -46,6 +47,7 @@ "menuColors": "Couleurs", "menuTrash": "Corbeille", "menuSetGeneral": "Général", + "menuSetBrowser": "Navigateur", "menuSetAbout": "À propos", "menuSetDevices": "Appareils", "menuAlertNoTags": "Aucun tag", @@ -60,7 +62,7 @@ "sysMenuServices": "Services", "sysMenuHide": "Cacher {}", "sysMenuHideOthers": "Cacher autres", - "sysMenuUnhide": "Montrer tous", + "sysMenuUnhide": "Montrer tout", "sysMenuQuit": "Quitter {}", "sysMenuEdit": "Editer", "sysMenuUndo": "Annuler", @@ -80,6 +82,8 @@ "alertCopy": "Copier", "alertClose": "Fermer", "alertDoNotAsk": "Ne plus me le redemander", + "alertAllow": "Autoriser", + "alertDeny": "Refuser", "appBeta": "ATTENTION: version beta, aperçu seulement", "footerOpen": "Ouvrir/Nouveau", "footerSyncError": "Erreur de synchronisation", @@ -139,6 +143,7 @@ "keyChangeMessageExpired": "La clé maître pour cette base de donnée est expirée. Merci de saisir une nouvelle clé.", "keyChangeRepeatPassword": "Mot de passe, encore une fois", "keyEnter": "Entrée", + "keyEsc": "Esc", "iconFavTitle": "Télécharger et utiliser le favicon du site web", "iconSelCustom": "Sélectionner une icône personnalisée", "listEmptyTitle": "Vide", @@ -267,6 +272,7 @@ "detMore": "plus", "detClickToAddField": "cliquez pour ajouter un nouveau champ", "detMenuAddNewField": "Ajouter nouveau champ", + "detMenuAddNewWebsite": "Ajouter un autre site", "detMenuShowEmpty": "Montrer les champs vides", "detMenuHideEmpty": "Cacher les champs vides", "detMenuAddField": "Ajouter {}", @@ -340,6 +346,7 @@ "autoTypeSelectionHintOpt": "Entrez seulement le compte", "autoTypeSelectionHintShift": "Autres champs", "autoTypeSelectionOtp": "code à usage unique", + "autoTypeUnlockMessage": "Déverrouiller pour saisir automatiquement", "appSecWarn": "Non sécurisé !", "appSecWarnBody1": "Vous avez chargé cette appli avec une connexion non sécurisée. Quelqu'un peut vous observer et voler vos mots de passe. Nous vous recommandons fortement d'arrêter cette connexion, à moins que vous ne compreniez exactement ce que vous faites.", "appSecWarnBody2": "Oui, votre base est chiffrée mais personne ne peut garantir que l'application n'a pas été modifiée avant d'arriver à vous.", @@ -614,6 +621,38 @@ "setPlTranslateLink": "traduire l'appli dans votre langue", "setPlAutoUpdate": "Mise à jour automatique", "setPlLoadGallery": "Charger le catalogue", + "setBrowserTitle": "Navigateur", + "setBrowserIntroDesktop": "KeeWeb peut entrer des mots de passe en utilisant la saisie automatique, cependant, une extension peut être un moyen plus pratique de le faire. KeeWeb prend en charge deux extensions de navigateur:", + "setBrowserIntroKeeWebConnect": "l'extension officielle KeeWeb est construite avec les fonctionnalités de KeeWeb, mais vous risquez de manquer certaines fonctionnalités avancées que l'on peut trouver dans l'autre extension.", + "setBrowserIntroKeePassXcBrowser": "cette extension a été développée pour KeePassXC, elle existe depuis un moment et est assez fiable. L'extension ne fait pas partie de KeeWeb et il peut y avoir des problèmes de compatibilité.", + "setBrowserIntroWeb": "Installez notre extension de navigateur pour remplir automatiquement les mots de passe de KeeWeb sur différentes pages. L'extension de navigateur se connectera à un onglet KeeWeb de votre navigateur pour récupérer les mots de passe. Cliquez ici pour télécharger l'extension:", + "setBrowserNotEnabled": "L'intégration du navigateur n'est pas activée, les extensions ne pourront pas se connecter à KeeWeb. Utilisez les cases à cocher ci-dessous pour l'activer:", + "setBrowserEnablePerBrowser": "Activer l'intégration dans le navigateur en cochant ci dessous:", + "setBrowserFocusIfLocked": "Ouvrir KeeWeb si le navigateur essaye de se connecter alors que aucun fichier n'est ouvert", + "setBrowserFocusIfEmpty": "Afficher la liste si aucune correspondance n'est trouvée avec l'URL", + "setBrowserOtherBrowsers": "Autres navigateurs", + "setBrowserExtensionFor": "pour {}", + "setBrowserExtensionNotSupported": "Non supporté", + "setBrowserExtensionHelp": "Comment installer ?", + "setBrowserExtensionInstall": "Installer l'application", + "setBrowserExtensionKPXCWarnHeader": "{} cessera de fonctionner", + "setBrowserExtensionKPXCWarnBody1": "Malheureusement, il n'est pas possible de connecter une extension à plusieurs applications. Si vous connectez l'extension à KeeWeb, nous remplacerons son association d'application, ce qui signifie que l'intégration avec {} cessera de fonctionner. Même si vous décochez cette case, l'association avec {} ne sera pas restaurée. Pour le faire fonctionner à nouveau, configurez l'intégration du navigateur dans les paramètres de {}.", + "setBrowserExtensionKPXCWarnBody2": "Configurer l'extension pour utiliser KeeWeb?", + "setBrowserSessions": "Sessions", + "setBrowserSessionsEmpty": "Aucune session connectée", + "setBrowserSessionsIntro": "Ces extensions sont connectées à KeeWeb", + "setBrowserSessionsActiveTooltip": "Session active", + "setBrowserSessionsActiveText": "Cette session est active. Elle peut échanger des données avec KeeWeb selon les permissions:", + "setBrowserSessionsInactiveTooltip": "session inactive", + "setBrowserSessionsInactiveText": "Cette session est inactive. L'extension est connectée à KeeWeb, cependant, elle n'a pas essayé d'échanger des données. Lorsque l'extension demande quelque chose, vous pourrez choisir ce que vous souhaitez partager.", + "setBrowserSessionsDeniedTooltip": "Accès interdit", + "setBrowserSessionsDeniedText": "Cette session est inactive. L'extension est connectée à KeeWeb mais vous avez refusé l'accès aux données.", + "setBrowserSessionsConnectedDate": "Connecté", + "setBrowserSessionsTerminate": "Clôturer la session", + "setBrowserSessionsAccessToFiles": "Autoriser l'accès aux fichiers", + "setBrowserSessionsNoFileAccess": "L'extension n'a accès à aucun fichier, elle ne pourra pas récupérer les mots de passe de KeeWeb.", + "setBrowserSessionsPasswordsRead": "Accès aux mot de passe", + "setBrowserSessionsPasswordsWritten": "Mots de passe enregistrés", "setDevicesTitle": "Appareils", "setDevicesEnableUsb": "Autoriser les interactions avec les appareils USB", "setDevicesYubiKeyIntro": "Il est recommandé de lire {} avant d'utiliser une YubiKey.", @@ -648,12 +687,12 @@ "setHelpProblems2": "ou {}", "setHelpOpenIssue": "faire connaître le problème sur GitHub", "setHelpContactLink": "contactez le développeur directement", - "setHelpAppInfo": "Information", + "setHelpAppInfo": "Informations", "setHelpOtherPlatforms": "Autres plateformes", "setHelpDesktopApps": "Applis Desktop", "setHelpWebApp": "Appli web", "setHelpUpdates": "Mises à jour", - "setHelpTwitter": "Appli twitter", + "setHelpTwitter": "Twitter", "dropboxSetupDesc": "Une configuration particulière est nécessaire pour utiliser Dropbox dans une application auto-hébergée. Merci de créer votre propre application Dropbox et d'inscrire sa clé ci-dessous.", "dropboxAppKey": "Clé Dropbox", "dropboxAppKeyDesc": "Copier la clé de votre appli Dropbox (Réglages développeur)", @@ -669,6 +708,8 @@ "dropboxLinkFull": "Tout Dropbox ou n'importe quel dossier", "dropboxLinkCustom": "Votre appli Dropbox", "gdriveSharedWithMe": "Partagé avec moi", + "gdriveSharedDrives": "Lecteurs partagés", + "gdriveTeamDrives": "Team drives", "webdavSaveMethod": "Méthode de sauvegarde", "webdavSaveMove": "Envoyer un fichier temporaire et le déplacer", "webdavSavePut": "Écraser le fichier kdbx avec PUT", @@ -697,5 +738,39 @@ "yubiKeyDisabledErrorHeader": "L'USB est désactivé", "yubiKeyDisabledErrorBody": "Yubikey est nécessaire pour ouvrir ce fichier, merci d'activer les appareils USB dans les paramètres", "yubiKeyErrorWithCode": "Erreur Yubikey code {}.", - "bioOpenAuthPrompt": "ouvrir \"{}\"" + "bioOpenAuthPrompt": "ouvrir \"{}\"", + "extensionErrorNoOpenFiles": "Aucun fichier ouvert", + "extensionErrorUserRejected": "La requête a été refusée", + "extensionErrorNoMatches": "Aucune correspondance", + "extensionErrorAlertDisplayed": "Impossible de poser une question maintenant car une autre boîte de dialogue est affichée, veuillez réessayer", + "extensionConnectHeader": "Échange de données avec l'extension", + "extensionConnectIntro": "Une extension de navigateur qui a pour nom {} essaie d'échanger des données avec KeeWeb.", + "extensionConnectUnknownActivity": "KeeWeb ne vérifie pas que l'application connectée est ce qu'elle prétend être. N'approuvez la demande que si vous en connaissez l'origine.", + "extensionConnectFiles": "Lors de cette session, autoriser l'accès à:", + "extensionConnectAllOtherFiles": "Tous les autres fichiers", + "extensionConnectAllFiles": "Tous les fichiers", + "extensionConnectAskGet": "Demandez avant d'envoyer les mots de passe à l'extension:", + "extensionConnectAskGetMultiple": "s'il y a plus d'une correspondance", + "extensionConnectAskGetAlways": "Toujours", + "extensionConnectAskSave": "Demandez avant d'enregistrer de nouveaux mots de passe dans KeeWeb:", + "extensionConnectAskSaveAlways": "Toujours", + "extensionConnectAskSaveAuto": "quand ce n'est pas possible de sauvegarder automatiquement", + "extensionConnectSettingsAreForSession": "Les paramètres que vous sélectionnez ici ne sont valides que pour la session en cours. Vous pouvez afficher et gérer les sessions dans les paramètres de KeeWeb.", + "extensionUnlockMessage": "Déverrouiller pour connecter l'extension du navigateur", + "extensionNewGroupHeader": "Nouveau groupe", + "extensionNewGroupBody": "{} essaye de créer un nouveau groupe. Autoriser cela?", + "extensionNewGroupPath": "Dossier du groupe", + "extensionNewGroupFile": "Ce groupe sera créé dans:", + "extensionSaveEntryHeader": "Sauvegarder mot de passe", + "extensionSaveEntryBody": "{} essaye de sauvegarder un mot de passe. Autoriser cela?", + "extensionSaveEntryAuto": "Sauvegarder les autres mots de passe automatiquement lors de cette session", + "extensionSaveEntryNewGroup": "nouveau groupe", + "extensionSelectPasswordFor": "Sélectionner un mot de passe pour {}", + "selectEntryHeader": "Sélectionner une entrée", + "selectEntryEnterHint": "Utiliser la ligne sélectionnée", + "selectEntryTypingHint": "Ecrire pour filtrer", + "selectEntryContains": "Contient le texte", + "selectEntrySubdomains": "Sous-domaines", + "selectEntryFieldHeader": "Sélectionnez un champ", + "selectEntryFieldTouch": "Appuyez sur le bouton de votre appareil pour générer un code à usage unique." } \ No newline at end of file From 4b7124aa573cd8ed8b0eb203b2ce41c0046dbb5e Mon Sep 17 00:00:00 2001 From: antelle Date: Sun, 18 Jul 2021 16:19:28 +0200 Subject: [PATCH 13/13] disabled automatic installation of KeePassXC-Browser extension --- app/scripts/const/links.js | 9 +-- .../views/settings/settings-browser-view.js | 3 + app/templates/settings/settings-browser.hbs | 59 +++++++++++-------- release-notes.md | 1 + 4 files changed, 41 insertions(+), 31 deletions(-) diff --git a/app/scripts/const/links.js b/app/scripts/const/links.js index d74b4758..696df3ad 100644 --- a/app/scripts/const/links.js +++ b/app/scripts/const/links.js @@ -23,17 +23,14 @@ const Links = { HaveIBeenPwnedPrivacy: 'https://haveibeenpwned.com/Passwords', ExtensionHelpForOtherBrowsers: 'https://github.com/keeweb/keeweb/wiki/Browser-AutoFill#other-browsers', + ExtensionHelpForKPXC: + 'https://github.com/keeweb/keeweb/wiki/Browser-AutoFill#keepassxc-browser', KWCForChrome: 'https://chrome.google.com/webstore/detail/keeweb-connect/pikpfmjfkekaeinceagbebpfkmkdlcjk', KWCForFirefox: 'https://addons.mozilla.org/firefox/addon/keeweb-connect/', KWCForEdge: 'https://microsoftedge.microsoft.com/addons/detail/keewebconnect/nmggpehkjmeaeocmaijenpejbepckinm', - KWCForSafari: 'https://apps.apple.com/app/keeweb-connect/id1565748094', - KPXCForChrome: - 'https://chrome.google.com/webstore/detail/keepassxc-browser/oboonakemofpalcgghocfoadofidjkkk', - KPXCForFirefox: 'https://addons.mozilla.org/firefox/addon/keepassxc-browser/', - KPXCForEdge: - 'https://microsoftedge.microsoft.com/addons/detail/keepassxcbrowser/pdffhmdngciaglkoonimfcmckehcpafo' + KWCForSafari: 'https://apps.apple.com/app/keeweb-connect/id1565748094' }; export { Links }; diff --git a/app/scripts/views/settings/settings-browser-view.js b/app/scripts/views/settings/settings-browser-view.js index 29c6cb80..d747dcfb 100644 --- a/app/scripts/views/settings/settings-browser-view.js +++ b/app/scripts/views/settings/settings-browser-view.js @@ -72,6 +72,9 @@ class SettingsBrowserView extends View { enabled: !!AppSettingsModel[`extensionEnabled${ext.alias}${browser}`], installUrl: Links[`${ext.alias}For${browser}`] }; + if (ext.alias === 'KPXC') { + ext.manualUrl = Links.ExtensionHelpForKPXC; + } if (!ext.installUrl) { if (browser === 'Other') { ext.helpUrl = Links.ExtensionHelpForOtherBrowsers; diff --git a/app/templates/settings/settings-browser.hbs b/app/templates/settings/settings-browser.hbs index 618c8acb..6984aad1 100644 --- a/app/templates/settings/settings-browser.hbs +++ b/app/templates/settings/settings-browser.hbs @@ -24,33 +24,42 @@ {{perBrowser.browserName}} {{#each perBrowser.extensions as |setting|}} - {{#if setting.supported}} - - + {{#if setting.manualUrl}} + + + {{else}} - - {{/if}} - {{#if setting.enabled}} - {{#if setting.helpUrl}} - - - + {{#if setting.supported}} + + + {{else}} + {{/if}} - {{#if setting.installUrl}} - - - + {{#if setting.enabled}} + {{#if setting.helpUrl}} + + + + {{/if}} + {{#if setting.installUrl}} + + + + {{/if}} {{/if}} {{/if}} diff --git a/release-notes.md b/release-notes.md index ab569e4e..58b4fe17 100644 --- a/release-notes.md +++ b/release-notes.md @@ -1,6 +1,7 @@ Release notes ------------- ##### v1.18.7 (2021-07-18) +`!` disabled automatic installation of KeePassXC-Browser extension `+` added an option to diagnose YubiKey code listing issues `-` fix #1845: fixed a visible crash on socket write error