self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-07-13 00:10:37 +02:00
Code Issues Releases Activity

All: Fixes #343, Fixes #191: Added options to ignore TLS cert errors to allow self-signed certificates on desktop and CLI

Browse Source
This commit is contained in:
Laurent Cozic
2018-06-20 00:28:50 +01:00
parent 617ed42d8c
commit aa7da784fc
4 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ReactNativeClient/lib/BaseApplication.js
View File

@ -309,6 +309,11 @@ class BaseApplication {
time.setTimeFormat(Setting.value('timeFormat')); time.setTimeFormat(Setting.value('timeFormat'));
} }
if ((action.type == 'SETTING_UPDATE_ONE' && action.key == 'net.ignoreTlsErrors') || (action.type == 'SETTING_UPDATE_ALL')) {
// https://stackoverflow.com/questions/20082893/unable-to-verify-leaf-signature
process.env['NODE_TLS_REJECT_UNAUTHORIZED'] = Setting.value('net.ignoreTlsErrors') ? '0' : '1';
}
if ((action.type == 'SETTING_UPDATE_ONE' && (action.key.indexOf('encryption.') === 0)) || (action.type == 'SETTING_UPDATE_ALL')) { if ((action.type == 'SETTING_UPDATE_ONE' && (action.key.indexOf('encryption.') === 0)) || (action.type == 'SETTING_UPDATE_ALL')) {
if (this.hasGui()) { if (this.hasGui()) {
await EncryptionService.instance().loadMasterKeysFromSettings(); await EncryptionService.instance().loadMasterKeysFromSettings();

2
ReactNativeClient/lib/models/Setting.js
View File

@ -149,6 +149,8 @@ class Setting extends BaseModel {
'sync.5.context': { value: '', type: Setting.TYPE_STRING, public: false }, 'sync.5.context': { value: '', type: Setting.TYPE_STRING, public: false },
'sync.6.context': { value: '', type: Setting.TYPE_STRING, public: false }, 'sync.6.context': { value: '', type: Setting.TYPE_STRING, public: false },
'sync.7.context': { value: '', type: Setting.TYPE_STRING, public: false }, 'sync.7.context': { value: '', type: Setting.TYPE_STRING, public: false },
'net.ignoreTlsErrors': { value: false, type: Setting.TYPE_BOOL, show: (settings) => { return [SyncTargetRegistry.nameToId('nextcloud'), SyncTargetRegistry.nameToId('webdav')].indexOf(settings['sync.target']) >= 0 }, public: true, appTypes: ['desktop', 'cli'], label: () => _('Ignore TLS certificate errors') },
}; };
return this.metadata_; return this.metadata_;

1
docs/clipper/index.html
View File

@ -292,7 +292,6 @@ for (let portToTest = 41184; portToTest <= 41194; portToTest++) {
} }
} }
</code></pre> </code></pre>
<p>start from 41184, then ping it (using the /ping method below)</p>
<p>The following methods are available:</p> <p>The following methods are available:</p>
<h3 id="get-ping">GET /ping</h3> <h3 id="get-ping">GET /ping</h3>
<p>Tells whether the service is active or not. It should return &quot;JoplinClipperServer&quot; if it works.</p> <p>Tells whether the service is active or not. It should return &quot;JoplinClipperServer&quot; if it works.</p>

2
readme/clipper.md
View File

@ -58,8 +58,6 @@ for (let portToTest = 41184; portToTest <= 41194; portToTest++) {
} }
``` ```
start from 41184, then ping it (using the /ping method below)
The following methods are available: The following methods are available:
### GET /ping ### GET /ping