From f2ecb1b71524e21500e54ca3e99979831455ac2d Mon Sep 17 00:00:00 2001 From: scith Date: Tue, 6 Dec 2016 03:09:15 +0100 Subject: [PATCH 1/5] Refresh app - Install from source - Config - 2.4 --- LICENSE | 44 +- README.md | 6 +- conf/config.json | 42 + manifest.json | 21 +- scripts/backup | 22 +- scripts/install | 47 +- scripts/remove | 16 +- scripts/restore | 29 +- scripts/upgrade | 55 +- sources/app.js | 266 ----- sources/icon.png | Bin 7568 -> 0 bytes sources/index.html | 25 - sources/main.js | 43 - .../node_modules/node-stream-zip/README.md | 78 -- .../node-stream-zip/node_stream_zip.js | 977 ------------------ .../node_modules/node-stream-zip/package.json | 91 -- sources/package.json | 13 - 17 files changed, 153 insertions(+), 1622 deletions(-) create mode 100644 conf/config.json delete mode 100644 sources/app.js delete mode 100644 sources/icon.png delete mode 100644 sources/index.html delete mode 100644 sources/main.js delete mode 100644 sources/node_modules/node-stream-zip/README.md delete mode 100644 sources/node_modules/node-stream-zip/node_stream_zip.js delete mode 100644 sources/node_modules/node-stream-zip/package.json delete mode 100644 sources/package.json diff --git a/LICENSE b/LICENSE index dba13ed..faf7bf4 100644 --- a/LICENSE +++ b/LICENSE @@ -616,46 +616,4 @@ an absolute waiver of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee. - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If your software can interact with users remotely through a computer -network, you should also make sure that it provides a way for users to -get its source. For example, if your program is a web application, its -interface could display a "Source" link that leads users to an archive -of the code. There are many ways you could offer source, and different -solutions will be better for different programs; see section 13 for the -specific requirements. - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU AGPL, see -. + END OF TERMS AND CONDITIONS \ No newline at end of file diff --git a/README.md b/README.md index 56f9c93..9238692 100644 --- a/README.md +++ b/README.md @@ -1,18 +1,14 @@ # Keeweb for YunoHost # -Web client for reading and editing Keepass files locally. It can also sync with Owncloud, Google Drive and Dropbox. +Web client for reading and editing Keepass files locally. It can also sync with WebDAV (Owncloud, Nextcloud...), Dropbox, Google Drive, OneDrive... ![screenshot](https://habrastorage.org/files/ec9/108/3de/ec91083de3e64574a504bc438d038dec.png) -**Current version: 1.1.4** - ## Usage with OwnCloud ## 1. Open your file through webdav using https://linktoowncloud/remote.php/webdav and your username and password ## Usage for Dropbox sync ## 1. [create](https://www.dropbox.com/developers/apps/create) a Dropbox app 2. find your app key (in Dropbox App page, go to Settings/App key) -3. Enter the app key during install - **More information on the documentation page:** diff --git a/conf/config.json b/conf/config.json new file mode 100644 index 0000000..2588f5d --- /dev/null +++ b/conf/config.json @@ -0,0 +1,42 @@ +{ + "settings": { + "theme": "fb", + "locale": "en", + "expandGroups": true, + "listViewWidth": null, + "menuViewWidth": null, + "tagsViewHeight": null, + "autoUpdate": "install", + "autoSave": true, + "rememberKeyFiles": false, + "idleMinutes": 15, + "tableView": false, + "colorfulIcons": false, + "lockOnCopy": false, + "skipOpenLocalWarn": false, + "hideEmptyFields": false, + "skipHttpsWarning": true, + "demoOpened": false, + "fontSize": 0, + "tableViewColumns": null, + "generatorPresets": null, + + "canOpen": true, + "canOpenDemo": true, + "canOpenSettings": true, + "canCreate": true, + "canImportXml": true, + + "dropbox": true, + "dropboxFolder": null, + "dropboxAppKey": null, + + "webdav": true, + + "gdrive": true, + "gdriveClientId": null, + + "onedrive": true, + "onedriveClientId": null + } +} \ No newline at end of file diff --git a/manifest.json b/manifest.json index e210b99..5e19a16 100644 --- a/manifest.json +++ b/manifest.json @@ -1,26 +1,25 @@ { - "package_format": 1, "name": "Keeweb", "id": "keeweb", + "packaging_format": 1, "description": { "en": "Password manager compatible with KeePass.", "fr": "Gestionnaire de mots de passe compatible avec KeePass." }, "url": "https://keeweb.info/", - "license": "AGPL-3", - "version": "1.1.4", + "license": "free", "maintainer": { "name": "Scith", "url": "https://github.com/scith" }, - "multi_instance": "false", + "requirements": { + "yunohost": ">> 2.4.0" + }, + "multi_instance": true, "services": [ "nginx", "php5-fpm" ], - "requirements": { - "yunohost": ">= 2.2" - }, "arguments": { "install" : [ { @@ -39,17 +38,17 @@ "en": "Choose a path for Keeweb", "fr": "Choisissez un chemin pour Keeweb" }, - "example": "/passwords", - "default": "/passwords" + "example": "/keeweb", + "default": "/keeweb" }, { "name": "is_public", + "type": "boolean", "ask": { "en": "Is it a public application?", "fr": "Est-ce une application publique ?" }, - "choices": ["Yes", "No"], - "default": "No" + "default": true } ] } diff --git a/scripts/backup b/scripts/backup index a38128d..638dca8 100644 --- a/scripts/backup +++ b/scripts/backup @@ -1,18 +1,16 @@ #!/bin/bash -# causes the shell to exit if any subcommand or pipeline returns a non-zero status -set -e +# Exit on command errors and treat unset variables as an error +set -eu -app=keeweb +app=$YNH_APP_INSTANCE_NAME -# The parameter $1 is the backup directory location which will be compressed afterward - backup_dir=$1/apps/$app - sudo mkdir -p $backup_dir +# Source YunoHost helpers + source /usr/share/yunohost/helpers # Backup sources & data - sudo cp -a /var/www/$app/. $backup_dir/sources - -# Copy Nginx and YunoHost parameters to make the script "standalone" - sudo cp -a /etc/yunohost/apps/$app/. $backup_dir/yunohost - domain=$(sudo yunohost app setting $app domain) - sudo cp -a /etc/nginx/conf.d/$domain.d/$app.conf $backup_dir/nginx.conf \ No newline at end of file + ynh_backup "/var/www/${app}" "sources" + +# Copy NGINX configuration + domain=$(ynh_app_setting_get "$app" domain) + ynh_backup "/etc/nginx/conf.d/${domain}.d/${app}.conf" "nginx.conf" diff --git a/scripts/install b/scripts/install index 21dfb7e..4b48382 100644 --- a/scripts/install +++ b/scripts/install @@ -1,42 +1,51 @@ #!/bin/bash -# causes the shell to exit if any subcommand or pipeline returns a non-zero status -set -e - -app=keeweb +# Exit on command errors and treat unset variables as an error +set -eu +app=$YNH_APP_INSTANCE_NAME + +# Source YunoHost helpers + source /usr/share/yunohost/helpers + # Retrieve arguments - domain=$1 - path=$2 - is_public=$3 + domain=$YNH_APP_ARG_DOMAIN + path=$YNH_APP_ARG_PATH + is_public=$YNH_APP_ARG_IS_PUBLIC +# Remove trailing "/" for next commands + path=${path%/} + # Save app settings - sudo yunohost app setting $app is_public -v "$is_public" + ynh_app_setting_set "$app" is_public "$is_public" # Check domain/path availability - sudo yunohost app checkurl $domain$path -a $app \ - || (echo "Path not available: $domain$path" && exit 1) + sudo yunohost app checkurl "${domain}${path}" -a "$app" \ + || ynh_die "Path not available: ${domain}${path}" + +# Download source + sudo wget https://raw.githubusercontent.com/keeweb/keeweb/gh-pages/index.html + sudo wget https://raw.githubusercontent.com/keeweb/keeweb/gh-pages/manifest.appcache + sudo sed -i.bak 's/(no-config)/config.json/g' index.html # Copy source files - final_path=/var/www/$app - sudo mkdir -p $final_path - sudo cp -a ../sources/. $final_path + src_path=/var/www/$app + sudo mkdir -p $src_path + sudo cp -a index.html manifest.appcache ../conf/config.json $src_path # Set permissions to app files - sudo chown -R root:root $final_path + sudo chown -R root: $src_path # Modify Nginx configuration file and copy it to Nginx conf directory sed -i "s@YNH_WWW_PATH@$path@g" ../conf/nginx.conf - sed -i "s@YNH_WWW_ALIAS@$final_path/@g" ../conf/nginx.conf + sed -i "s@YNH_WWW_ALIAS@$src_path/@g" ../conf/nginx.conf sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/$app.conf # If app is public, add url to SSOWat conf as skipped_uris - if [ "$is_public" = "Yes" ]; - then + if [[ $is_public -eq 1 ]]; then # unprotected_uris allows SSO credentials to be passed anyway. - sudo yunohost app setting $app unprotected_uris -v "/" + ynh_app_setting_set "$app" unprotected_uris "/" fi # Restart services sudo service nginx reload - sudo yunohost app ssowatconf diff --git a/scripts/remove b/scripts/remove index f8d619c..b963577 100644 --- a/scripts/remove +++ b/scripts/remove @@ -1,18 +1,18 @@ #!/bin/bash -app=keeweb + +app=$YNH_APP_INSTANCE_NAME + +# Source YunoHost helpers + source /usr/share/yunohost/helpers # Retrieve arguments - domain=$(sudo yunohost app setting $app domain) - path=$(sudo yunohost app setting $app path) - dropbox=$(sudo yunohost app setting $app dropbox) - is_public=$(sudo yunohost app setting $app is_public) + domain=$(ynh_app_setting_get "$app" domain) # Remove sources sudo rm -rf /var/www/$app -# Remove configuration files +# Remove nginx configuration file sudo rm -f /etc/nginx/conf.d/$domain.d/$app.conf # Restart services - sudo service nginx reload - sudo yunohost app ssowatconf + sudo service nginx reload \ No newline at end of file diff --git a/scripts/restore b/scripts/restore index 2afd736..4b7247b 100644 --- a/scripts/restore +++ b/scripts/restore @@ -1,23 +1,30 @@ #!/bin/bash -# causes the shell to exit if any subcommand or pipeline returns a non-zero status -set -e +# Exit on command errors and treat unset variables as an error +set -eu -app=keeweb +app=$YNH_APP_INSTANCE_NAME -# The parameter $1 is the uncompressed restore directory location - backup_dir=$1/apps/$app +# Source YunoHost helpers + source /usr/share/yunohost/helpers + +# Retrieve old app settings + domain=$(ynh_app_setting_get "$app" domain) + path=$(ynh_app_setting_get "$app" path) + +# Check domain/path availability + sudo yunohost app checkurl "${domain}${path}" -a "$app" \ + || ynh_die "Path not available: ${domain}${path}" # Restore sources & data - sudo cp -a $backup_dir/sources/. /var/www/$app + src_path="/var/www/${app}" + sudo cp -a ./sources "$src_path" # Restore permissions to app files - sudo chown -R root:root $final_path + sudo chown -R root: "$src_path" -# Restore Nginx and YunoHost parameters - sudo cp -a $backup_dir/yunohost/. /etc/yunohost/apps/$app - domain=$(sudo yunohost app setting $app domain) - sudo cp -a $backup_dir/nginx.conf /etc/nginx/conf.d/$domain.d/$app.conf +# Restore NGINX configuration + sudo cp -a ./nginx.conf "/etc/nginx/conf.d/${domain}.d/${app}.conf" # Restart webserver sudo service nginx reload diff --git a/scripts/upgrade b/scripts/upgrade index 06c977b..cbe3e18 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -1,40 +1,55 @@ #!/bin/bash -# causes the shell to exit if any subcommand or pipeline returns a non-zero status -set -e +# Exit on command errors and treat unset variables as an error +set -eu -app=keeweb +app=$YNH_APP_INSTANCE_NAME + +# Source YunoHost helpers + source /usr/share/yunohost/helpers # Retrieve arguments - domain=$(sudo yunohost app setting $app domain) - path=$(sudo yunohost app setting $app path) - is_public=$(sudo yunohost app setting $app is_public) - + domain=$(ynh_app_setting_get "$app" domain) + path=$(ynh_app_setting_get "$app" path) + is_public=$(ynh_app_setting_get "$app" is_public) + # Remove trailing "/" for next commands path=${path%/} - + +# Check domain/path availability + sudo yunohost app checkurl "${domain}${path}" -a "$app" \ + || ynh_die "Path not available: ${domain}${path}" + +# Download source + sudo wget https://raw.githubusercontent.com/keeweb/keeweb/gh-pages/index.html + sudo wget https://raw.githubusercontent.com/keeweb/keeweb/gh-pages/manifest.appcache + sudo sed -i.bak 's/(no-config)/config.json/g' index.html + # Copy source files - final_path=/var/www/$app - sudo mkdir -p $final_path - sudo cp -a ../sources/. $final_path + src_path=/var/www/$app + sudo mkdir -p $src_path + sudo cp -a index.html manifest.appcache ../conf/config.json $src_path # Set permissions to app files - sudo chown -R root:root $final_path + sudo chown -R root: $src_path # Modify Nginx configuration file and copy it to Nginx conf directory sed -i "s@YNH_WWW_PATH@$path@g" ../conf/nginx.conf - sed -i "s@YNH_WWW_ALIAS@$final_path/@g" ../conf/nginx.conf + sed -i "s@YNH_WWW_ALIAS@$src_path/@g" ../conf/nginx.conf sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/$app.conf +# Migrate old apps + if [ "$is_public" = "Yes" ]; then + ynh_app_setting_set "$app" is_public "true" + elif [ "$is_public" = "No" ]; then + ynh_app_setting_set "$app" is_public "false" + fi + # If app is public, add url to SSOWat conf as skipped_uris - if [ "$is_public" = "Yes" ]; - then - # See install script - sudo yunohost app setting $app unprotected_uris -v "/" - # Remove old settings - sudo yunohost app setting $app skipped_uris -d + if [[ $is_public -eq 1 ]]; then + # unprotected_uris allows SSO credentials to be passed anyway. + ynh_app_setting_set "$app" unprotected_uris "/" fi # Restart services sudo service nginx reload - sudo yunohost app ssowatconf diff --git a/sources/app.js b/sources/app.js deleted file mode 100644 index 4545c0b..0000000 --- a/sources/app.js +++ /dev/null @@ -1,266 +0,0 @@ -'use strict'; - -/* jshint node:true */ -/* jshint browser:false */ - -var app = require('app'), - path = require('path'), - fs = require('fs'), - BrowserWindow = require('browser-window'), - Menu = require('menu'), - Tray = require('tray'), - globalShortcut = require('electron').globalShortcut; - -var mainWindow = null, - appIcon = null, - openFile = process.argv.filter(function(arg) { return /\.kdbx$/i.test(arg); })[0], - ready = false, - restartPending = false, - htmlPath = path.join(__dirname, 'index.html'), - mainWindowPosition = {}, - updateMainWindowPositionTimeout = null, - windowPositionFileName = path.join(app.getPath('userData'), 'window-position.json'); - -process.argv.forEach(function(arg) { - if (arg.lastIndexOf('--htmlpath=', 0) === 0) { - htmlPath = path.resolve(arg.replace('--htmlpath=', ''), 'index.html'); - } -}); - -app.on('window-all-closed', function() { - if (restartPending) { - // unbind all handlers, load new app.js module and pass control to it - globalShortcut.unregisterAll(); - app.removeAllListeners('window-all-closed'); - app.removeAllListeners('ready'); - app.removeAllListeners('open-file'); - app.removeAllListeners('activate'); - var userDataAppFile = path.join(app.getPath('userData'), 'app.js'); - delete require.cache[require.resolve('./app.js')]; - require(userDataAppFile); - app.emit('ready'); - } else { - if (process.platform !== 'darwin') { - app.quit(); - } - } -}); -app.on('ready', function() { - setAppOptions(); - createMainWindow(); - setGlobalShortcuts(); -}); -app.on('open-file', function(e, path) { - e.preventDefault(); - openFile = path; - notifyOpenFile(); -}); -app.on('activate', function() { - if (process.platform === 'darwin') { - if (!mainWindow) { - createMainWindow(); - } - } -}); -app.on('will-quit', function() { - globalShortcut.unregisterAll(); -}); -app.restartApp = function() { - restartPending = true; - mainWindow.close(); - setTimeout(function() { restartPending = false; }, 1000); -}; -app.openWindow = function(opts) { - return new BrowserWindow(opts); -}; -app.minimizeApp = function() { - if (process.platform !== 'darwin') { - mainWindow.minimize(); - mainWindow.setSkipTaskbar(true); - appIcon = new Tray(path.join(__dirname, 'icon.png')); - appIcon.on('click', restoreMainWindow); - var contextMenu = Menu.buildFromTemplate([ - { label: 'Open KeeWeb', click: restoreMainWindow }, - { label: 'Quit KeeWeb', click: closeMainWindow } - ]); - appIcon.setContextMenu(contextMenu); - appIcon.setToolTip('KeeWeb'); - } -}; -app.getMainWindow = function() { - return mainWindow; -}; - -function setAppOptions() { - app.commandLine.appendSwitch('disable-background-timer-throttling'); -} - -function createMainWindow() { - mainWindow = new BrowserWindow({ - show: false, - width: 1000, height: 700, 'min-width': 700, 'min-height': 400, - icon: path.join(__dirname, 'icon.png') - }); - setMenu(); - mainWindow.loadURL('file://' + htmlPath); - mainWindow.webContents.on('dom-ready', function() { - setTimeout(function() { - mainWindow.show(); - ready = true; - notifyOpenFile(); - }, 50); - }); - mainWindow.on('resize', delaySaveMainWindowPosition); - mainWindow.on('move', delaySaveMainWindowPosition); - mainWindow.on('close', updateMainWindowPositionIfPending); - mainWindow.on('closed', function() { - mainWindow = null; - saveMainWindowPosition(); - }); - mainWindow.on('minimize', function() { - emitBackboneEvent('launcher-minimize'); - }); - restoreMainWindowPosition(); -} - -function restoreMainWindow() { - appIcon.destroy(); - appIcon = null; - mainWindow.restore(); - mainWindow.setSkipTaskbar(false); -} - -function closeMainWindow() { - appIcon.destroy(); - appIcon = null; - emitBackboneEvent('launcher-exit-request'); -} - -function delaySaveMainWindowPosition() { - if (updateMainWindowPositionTimeout) { - clearTimeout(updateMainWindowPositionTimeout); - } - updateMainWindowPositionTimeout = setTimeout(updateMainWindowPosition, 500); -} - -function updateMainWindowPositionIfPending() { - if (updateMainWindowPositionTimeout) { - clearTimeout(updateMainWindowPositionTimeout); - updateMainWindowPosition(); - } -} - -function updateMainWindowPosition() { - if (!mainWindow) { - return; - } - updateMainWindowPositionTimeout = null; - var bounds = mainWindow.getBounds(); - if (!mainWindow.isMaximized() && !mainWindow.isMinimized() && !mainWindow.isFullScreen()) { - mainWindowPosition.x = bounds.x; - mainWindowPosition.y = bounds.y; - mainWindowPosition.width = bounds.width; - mainWindowPosition.height = bounds.height; - } - mainWindowPosition.maximized = mainWindow.isMaximized(); - mainWindowPosition.fullScreen = mainWindow.isFullScreen(); - mainWindowPosition.displayBounds = require('screen').getDisplayMatching(bounds).bounds; - mainWindowPosition.changed = true; -} - -function saveMainWindowPosition() { - if (!mainWindowPosition.changed) { - return; - } - delete mainWindowPosition.changed; - try { - fs.writeFileSync(windowPositionFileName, JSON.stringify(mainWindowPosition), 'utf8'); - } catch (e) {} -} - -function restoreMainWindowPosition() { - fs.readFile(windowPositionFileName, 'utf8', function(err, data) { - if (data) { - mainWindowPosition = JSON.parse(data); - if (mainWindow && mainWindowPosition) { - if (mainWindowPosition.width && mainWindowPosition.height) { - var displayBounds = require('screen').getDisplayMatching(mainWindowPosition).bounds; - var db = mainWindowPosition.displayBounds; - if (displayBounds.x === db.x && displayBounds.y === db.y && - displayBounds.width === db.width && displayBounds.height === db.height) { - mainWindow.setBounds(mainWindowPosition); - } - } - if (mainWindowPosition.maximized) { mainWindow.maximize(); } - if (mainWindowPosition.fullScreen) { mainWindow.setFullScreen(true); } - } - } - }); -} - -function emitBackboneEvent(e) { - mainWindow.webContents.executeJavaScript('Backbone.trigger("' + e + '");'); -} - -function setMenu() { - if (process.platform === 'darwin') { - var name = require('app').getName(); - var template = [ - { - label: name, - submenu: [ - { label: 'About ' + name, role: 'about' }, - { type: 'separator' }, - { label: 'Services', role: 'services', submenu: [] }, - { type: 'separator' }, - { label: 'Hide ' + name, accelerator: 'Command+H', role: 'hide' }, - { label: 'Hide Others', accelerator: 'Command+Shift+H', role: 'hideothers' }, - { label: 'Show All', role: 'unhide' }, - { type: 'separator' }, - { label: 'Quit', accelerator: 'Command+Q', click: function() { app.quit(); } } - ] - }, - { - label: 'Edit', - submenu: [ - { label: 'Undo', accelerator: 'CmdOrCtrl+Z', role: 'undo' }, - { label: 'Redo', accelerator: 'Shift+CmdOrCtrl+Z', role: 'redo' }, - { type: 'separator' }, - { label: 'Cut', accelerator: 'CmdOrCtrl+X', role: 'cut' }, - { label: 'Copy', accelerator: 'CmdOrCtrl+C', role: 'copy' }, - { label: 'Paste', accelerator: 'CmdOrCtrl+V', role: 'paste' }, - { label: 'Select All', accelerator: 'CmdOrCtrl+A', role: 'selectall' } - ] - } - ]; - var menu = Menu.buildFromTemplate(template); - Menu.setApplicationMenu(menu); - } -} - -function notifyOpenFile() { - if (ready && openFile && mainWindow) { - openFile = openFile.replace(/"/g, '\\"').replace(/\\/g, '\\\\'); - mainWindow.webContents.executeJavaScript('if (window.launcherOpen) { window.launcherOpen("' + openFile + '"); } ' + - ' else { window.launcherOpenedFile="' + openFile + '"; }'); - openFile = null; - } -} - -function setGlobalShortcuts() { - var shortcutModifiers = process.platform === 'darwin' ? 'Ctrl+Alt+' : 'Shift+Alt+'; - var shortcuts = { - C: 'copy-password', - B: 'copy-user', - U: 'copy-url' - }; - Object.keys(shortcuts).forEach(function(key) { - var shortcut = shortcutModifiers + key; - var eventName = shortcuts[key]; - try { - globalShortcut.register(shortcut, function () { - emitBackboneEvent(eventName); - }); - } catch (e) {} - }); -} diff --git a/sources/icon.png b/sources/icon.png deleted file mode 100644 index 0e2774a7a234495f62952575b494aa12bceaa5c6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7568 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 \ No newline at end of file diff --git a/sources/main.js b/sources/main.js deleted file mode 100644 index 84015d2..0000000 --- a/sources/main.js +++ /dev/null @@ -1,43 +0,0 @@ -// KeeWeb launcher script - -// This script is distributed with the app and is its entry point -// It checks whether the app is available in userData folder and if its version is higher than local, launches it -// This script is the only part which will be updated only with the app itself, auto-update will not change it - -// (C) Antelle 2015, MIT license https://github.com/antelle/keeweb - -'use strict'; - -/* jshint node:true */ -/* jshint browser:false */ - -var app = require('app'), - path = require('path'), - fs = require('fs'); - -var userDataDir = app.getPath('userData'), - appPathUserData = path.join(userDataDir, 'app.js'), - appPath = path.join(__dirname, 'app.js'); - -if (fs.existsSync(appPathUserData)) { - var versionLocal = require('./package.json').version; - try { - var versionUserData = require(path.join(userDataDir, 'package.json')).version; - versionLocal = versionLocal.split('.'); - versionUserData = versionUserData.split('.'); - for (var i = 0; i < versionLocal.length; i++) { - if (+versionUserData[i] > +versionLocal[i]) { - appPath = appPathUserData; - break; - } - if (+versionUserData[i] < +versionLocal[i]) { - break; - } - } - } - catch (e) { - console.error('Error reading user file version', e); - } -} - -require(appPath); diff --git a/sources/node_modules/node-stream-zip/README.md b/sources/node_modules/node-stream-zip/README.md deleted file mode 100644 index 1fe4dfe..0000000 --- a/sources/node_modules/node-stream-zip/README.md +++ /dev/null @@ -1,78 +0,0 @@ -# node-stream-zip [![Build status](https://travis-ci.org/antelle/node-stream-zip.svg?branch=master)](https://travis-ci.org/antelle/node-stream-zip) - -node.js library for reading and extraction of ZIP archives. -Features: - -- it never loads entire archive into memory, everything is read by chunks -- large archives support -- all operations are non-blocking, no sync i/o -- fast initialization -- no dependencies, no binary addons -- decompression with built-in zlib module -- deflate, deflate64, sfx, macosx/windows built-in archives -- ZIP64 support - -# Installation - -`$ npm install node-stream-zip` - -# Usage - -```javascript -var StreamZip = require('node-stream-zip'); -var zip = new StreamZip({ - file: 'archive.zip', - storeEntries: true -}); -zip.on('error', function(err) { /*handle*/ }); -zip.on('ready', function() { - console.log('Entries read: ' + zip.entriesCount); - // stream to stdout - zip.stream('node/benchmark/net/tcp-raw-c2s.js', function(err, stm) { - stm.pipe(process.stdout); - }); - // extract file - zip.extract('node/benchmark/net/tcp-raw-c2s.js', './temp/', function(err) { - console.log('Entry extracted'); - }); - // extract folder - zip.extract('node/benchmark/', './temp/', function(err, count) { - console.log('Extracted ' + count + ' entries'); - }); - // extract all - zip.extract(null, './temp/', function(err, count) { - console.log('Extracted ' + count + ' entries'); - }); - // read file as buffer in sync way - var data = zip.entryDataSync('README.md'); -}); -zip.on('extract', function(entry, file) { - console.log('Extracted ' + entry.name + ' to ' + file); -}); -zip.on('entry', function(entry) { - // called on load, when entry description has been read - // you can already stream this entry, without waiting until all entry descriptions are read (suitable for very large archives) - console.log('Read entry ', entry.name); -}); -``` - -If you pass `storeEntries: true` to constructor, you will be able to access entries inside zip archive with: - -- `zip.entries()` - get all entries description -- `zip.entry(name)` - get entry description by name -- `zip.stream(entry, function(err, stm) { })` - get entry data reader stream -- `zip.entryDataSync(entry)` - get entry data in sync way - -# Building - -The project doesn't require building. To run unit tests with [nodeunit](https://github.com/caolan/nodeunit): -`$ npm test` - -# Known issues - -- [utf8](https://github.com/rubyzip/rubyzip/wiki/Files-with-non-ascii-filenames) file names -- AES encrypted files - -# Contributors - -ZIP parsing code has been partially forked from [cthackers/adm-zip](https://github.com/cthackers/adm-zip) (MIT license). diff --git a/sources/node_modules/node-stream-zip/node_stream_zip.js b/sources/node_modules/node-stream-zip/node_stream_zip.js deleted file mode 100644 index 79a9360..0000000 --- a/sources/node_modules/node-stream-zip/node_stream_zip.js +++ /dev/null @@ -1,977 +0,0 @@ -/** - * @license node-stream-zip | (c) 2015 Antelle | https://github.com/antelle/node-stream-zip/blob/master/MIT-LICENSE.txt - * Portions copyright https://github.com/cthackers/adm-zip | https://raw.githubusercontent.com/cthackers/adm-zip/master/MIT-LICENSE.txt - */ - -// region Deps - -var - util = require('util'), - fs = require('fs'), - path = require('path'), - events = require('events'), - zlib = require('zlib'), - stream = require('stream'); - -// endregion - -// region Constants - -var consts = { - /* The local file header */ - LOCHDR : 30, // LOC header size - LOCSIG : 0x04034b50, // "PK\003\004" - LOCVER : 4, // version needed to extract - LOCFLG : 6, // general purpose bit flag - LOCHOW : 8, // compression method - LOCTIM : 10, // modification time (2 bytes time, 2 bytes date) - LOCCRC : 14, // uncompressed file crc-32 value - LOCSIZ : 18, // compressed size - LOCLEN : 22, // uncompressed size - LOCNAM : 26, // filename length - LOCEXT : 28, // extra field length - - /* The Data descriptor */ - EXTSIG : 0x08074b50, // "PK\007\008" - EXTHDR : 16, // EXT header size - EXTCRC : 4, // uncompressed file crc-32 value - EXTSIZ : 8, // compressed size - EXTLEN : 12, // uncompressed size - - /* The central directory file header */ - CENHDR : 46, // CEN header size - CENSIG : 0x02014b50, // "PK\001\002" - CENVEM : 4, // version made by - CENVER : 6, // version needed to extract - CENFLG : 8, // encrypt, decrypt flags - CENHOW : 10, // compression method - CENTIM : 12, // modification time (2 bytes time, 2 bytes date) - CENCRC : 16, // uncompressed file crc-32 value - CENSIZ : 20, // compressed size - CENLEN : 24, // uncompressed size - CENNAM : 28, // filename length - CENEXT : 30, // extra field length - CENCOM : 32, // file comment length - CENDSK : 34, // volume number start - CENATT : 36, // internal file attributes - CENATX : 38, // external file attributes (host system dependent) - CENOFF : 42, // LOC header offset - - /* The entries in the end of central directory */ - ENDHDR : 22, // END header size - ENDSIG : 0x06054b50, // "PK\005\006" - ENDSIGFIRST : 0x50, - ENDSUB : 8, // number of entries on this disk - ENDTOT : 10, // total number of entries - ENDSIZ : 12, // central directory size in bytes - ENDOFF : 16, // offset of first CEN header - ENDCOM : 20, // zip file comment length - MAXFILECOMMENT : 0xFFFF, - - /* The entries in the end of ZIP64 central directory locator */ - ENDL64HDR : 20, // ZIP64 end of central directory locator header size - ENDL64SIG : 0x07064b50, // ZIP64 end of central directory locator signature - ENDL64SIGFIRST : 0x50, - ENDL64OFS : 8, // ZIP64 end of central directory offset - - /* The entries in the end of ZIP64 central directory */ - END64HDR : 56, // ZIP64 end of central directory header size - END64SIG : 0x06064b50, // ZIP64 end of central directory signature - END64SIGFIRST : 0x50, - END64SUB : 24, // number of entries on this disk - END64TOT : 32, // total number of entries - END64SIZ : 40, - END64OFF : 48, - - /* Compression methods */ - STORED : 0, // no compression - SHRUNK : 1, // shrunk - REDUCED1 : 2, // reduced with compression factor 1 - REDUCED2 : 3, // reduced with compression factor 2 - REDUCED3 : 4, // reduced with compression factor 3 - REDUCED4 : 5, // reduced with compression factor 4 - IMPLODED : 6, // imploded - // 7 reserved - DEFLATED : 8, // deflated - ENHANCED_DEFLATED: 9, // enhanced deflated - PKWARE : 10,// PKWare DCL imploded - // 11 reserved - BZIP2 : 12, // compressed using BZIP2 - // 13 reserved - LZMA : 14, // LZMA - // 15-17 reserved - IBM_TERSE : 18, // compressed using IBM TERSE - IBM_LZ77 : 19, //IBM LZ77 z - - /* General purpose bit flag */ - FLG_ENC : 0, // encrypted file - FLG_COMP1 : 1, // compression option - FLG_COMP2 : 2, // compression option - FLG_DESC : 4, // data descriptor - FLG_ENH : 8, // enhanced deflation - FLG_STR : 16, // strong encryption - FLG_LNG : 1024, // language encoding - FLG_MSK : 4096, // mask header values - FLG_ENTRY_ENC : 1, - - /* 4.5 Extensible data fields */ - EF_ID : 0, - EF_SIZE : 2, - - /* Header IDs */ - ID_ZIP64 : 0x0001, - ID_AVINFO : 0x0007, - ID_PFS : 0x0008, - ID_OS2 : 0x0009, - ID_NTFS : 0x000a, - ID_OPENVMS : 0x000c, - ID_UNIX : 0x000d, - ID_FORK : 0x000e, - ID_PATCH : 0x000f, - ID_X509_PKCS7 : 0x0014, - ID_X509_CERTID_F : 0x0015, - ID_X509_CERTID_C : 0x0016, - ID_STRONGENC : 0x0017, - ID_RECORD_MGT : 0x0018, - ID_X509_PKCS7_RL : 0x0019, - ID_IBM1 : 0x0065, - ID_IBM2 : 0x0066, - ID_POSZIP : 0x4690, - - EF_ZIP64_OR_32 : 0xffffffff, - EF_ZIP64_OR_16 : 0xffff -}; - -// endregion - -// region StreamZip - -var StreamZip = function(config) { - var - fd, - fileSize, - chunkSize, - ready = false, - that = this, - op, - centralDirectory, - - entries = config.storeEntries !== false ? {} : null, - fileName = config.file; - - open(); - - function open() { - fs.open(fileName, 'r', function(err, f) { - if (err) - return that.emit('error', err); - fd = f; - fs.fstat(fd, function(err, stat) { - if (err) - return that.emit('error', err); - fileSize = stat.size; - chunkSize = config.chunkSize || Math.round(fileSize / 1000); - chunkSize = Math.max(Math.min(chunkSize, Math.min(128*1024, fileSize)), Math.min(1024, fileSize)); - readCentralDirectory(); - }); - }); - } - - function readUntilFoundCallback(err, bytesRead) { - if (err || !bytesRead) - return that.emit('error', err || 'Archive read error'); - var - buffer = op.win.buffer, - pos = op.lastPos, - bufferPosition = pos - op.win.position, - minPos = op.minPos; - while (--pos >= minPos && --bufferPosition >= 0) { - if (buffer[bufferPosition] === op.firstByte) { // quick check first signature byte - if (buffer.readUInt32LE(bufferPosition) === op.sig) { - op.lastBufferPosition = bufferPosition; - op.lastBytesRead = bytesRead; - op.complete(); - return; - } - } - } - if (pos === minPos) { - return that.emit('error', 'Bad archive'); - } - op.lastPos = pos + 1; - op.chunkSize *= 2; - if (pos <= minPos) - return that.emit('error', 'Bad archive'); - var expandLength = Math.min(op.chunkSize, pos - minPos); - op.win.expandLeft(expandLength, readUntilFoundCallback); - - } - - function readCentralDirectory() { - var totalReadLength = Math.min(consts.ENDHDR + consts.MAXFILECOMMENT, fileSize); - op = { - win: new FileWindowBuffer(fd), - totalReadLength: totalReadLength, - minPos: fileSize - totalReadLength, - lastPos: fileSize, - chunkSize: Math.min(1024, chunkSize), - firstByte: consts.ENDSIGFIRST, - sig: consts.ENDSIG, - complete: readCentralDirectoryComplete - }; - op.win.read(fileSize - op.chunkSize, op.chunkSize, readUntilFoundCallback); - } - - function readCentralDirectoryComplete() { - var buffer = op.win.buffer; - var pos = op.lastBufferPosition; - try { - centralDirectory = new CentralDirectoryHeader(); - centralDirectory.read(buffer.slice(pos, pos + consts.ENDHDR)); - centralDirectory.headerOffset = op.win.position + pos; - if (centralDirectory.commentLength) - that.comment = buffer.slice(pos + consts.ENDHDR, - pos + consts.ENDHDR + centralDirectory.commentLength).toString(); - else - that.comment = null; - that.entriesCount = centralDirectory.volumeEntries; - that.centralDirectory = centralDirectory; - if (centralDirectory.volumeEntries === consts.EF_ZIP64_OR_16 && centralDirectory.totalEntries === consts.EF_ZIP64_OR_16 - || centralDirectory.size === consts.EF_ZIP64_OR_32 || centralDirectory.offset === consts.EF_ZIP64_OR_32) { - readZip64CentralDirectoryLocator(); - } else { - op = {}; - readEntries(); - } - } catch (err) { - that.emit('error', err); - } - } - - function readZip64CentralDirectoryLocator() { - var length = consts.ENDL64HDR; - if (op.lastBufferPosition > length) { - op.lastBufferPosition -= length; - readZip64CentralDirectoryLocatorComplete(); - } else { - op = { - win: op.win, - totalReadLength: length, - minPos: op.win.position - length, - lastPos: op.win.position, - chunkSize: op.chunkSize, - firstByte: consts.ENDL64SIGFIRST, - sig: consts.ENDL64SIG, - complete: readZip64CentralDirectoryLocatorComplete - }; - op.win.read(op.lastPos - op.chunkSize, op.chunkSize, readUntilFoundCallback); - } - } - - function readZip64CentralDirectoryLocatorComplete() { - var buffer = op.win.buffer; - var locHeader = new CentralDirectoryLoc64Header(); - locHeader.read(buffer.slice(op.lastBufferPosition, op.lastBufferPosition + consts.ENDL64HDR)); - var readLength = fileSize - locHeader.headerOffset; - op = { - win: op.win, - totalReadLength: readLength, - minPos: locHeader.headerOffset, - lastPos: op.lastPos, - chunkSize: op.chunkSize, - firstByte: consts.END64SIGFIRST, - sig: consts.END64SIG, - complete: readZip64CentralDirectoryComplete - }; - op.win.read(fileSize - op.chunkSize, op.chunkSize, readUntilFoundCallback); - } - - function readZip64CentralDirectoryComplete() { - var buffer = op.win.buffer; - var zip64cd = new CentralDirectoryZip64Header(); - zip64cd.read(buffer.slice(op.lastBufferPosition, op.lastBufferPosition + consts.END64HDR)); - that.centralDirectory.volumeEntries = zip64cd.volumeEntries; - that.centralDirectory.totalEntries = zip64cd.totalEntries; - that.centralDirectory.size = zip64cd.size; - that.centralDirectory.offset = zip64cd.offset; - that.entriesCount = zip64cd.volumeEntries; - op = {}; - readEntries(); - } - - function readEntries() { - op = { - win: new FileWindowBuffer(fd), - pos: centralDirectory.offset, - chunkSize: chunkSize, - entriesLeft: centralDirectory.volumeEntries - }; - op.win.read(op.pos, Math.min(chunkSize, fileSize - op.pos), readEntriesCallback); - } - - function readEntriesCallback(err, bytesRead) { - if (err || !bytesRead) - return that.emit('error', err || 'Entries read error'); - var - buffer = op.win.buffer, - bufferPos = op.pos - op.win.position, - bufferLength = buffer.length, - entry = op.entry; - try { - while (op.entriesLeft > 0) { - if (!entry) { - entry = new ZipEntry(); - entry.readHeader(buffer, bufferPos); - entry.headerOffset = op.win.position + bufferPos; - op.entry = entry; - op.pos += consts.CENHDR; - bufferPos += consts.CENHDR; - } - var entryHeaderSize = entry.fnameLen + entry.extraLen + entry.comLen; - var advanceBytes = entryHeaderSize + (op.entriesLeft > 1 ? consts.CENHDR : 0); - if (bufferLength - bufferPos < advanceBytes) { - op.win.moveRight(chunkSize, readEntriesCallback, bufferPos); - op.move = true; - return; - } - entry.read(buffer, bufferPos); - if (entries) - entries[entry.name] = entry; - that.emit('entry', entry); - op.entry = entry = null; - op.entriesLeft--; - op.pos += entryHeaderSize; - bufferPos += entryHeaderSize; - } - that.emit('ready'); - } catch (err) { - that.emit('error', err); - } - } - - function checkEntriesExist() { - if (!entries) - throw 'storeEntries disabled'; - } - - Object.defineProperty(this, 'ready', { get: function() { return ready; } }); - - this.entry = function(name) { - checkEntriesExist(); - return entries[name]; - }; - - this.entries = function() { - checkEntriesExist(); - return entries; - }; - - this.stream = function(entry, callback) { - return openEntry(entry, function(err, entry) { - if (err) - return callback(err); - var offset = dataOffset(entry); - var entryStream = new EntryDataReaderStream(fd, offset, entry.compressedSize); - if (entry.method === consts.STORED) { - } else if (entry.method === consts.DEFLATED || entry.method === consts.ENHANCED_DEFLATED) { - entryStream = entryStream.pipe(zlib.createInflateRaw()); - } else { - return callback('Unknown compression method: ' + entry.method); - } - if (canVerifyCrc(entry)) - entryStream = entryStream.pipe(new EntryVerifyStream(entryStream, entry.crc, entry.size)); - callback(null, entryStream); - }, false); - }; - - this.entryDataSync = function(entry) { - var err = null; - openEntry(entry, function(e, en) { - err = e; - entry = en; - }, true); - if (err) - throw err; - var - data = new Buffer(entry.compressedSize), - bytesRead; - new FsRead(fd, data, 0, entry.compressedSize, dataOffset(entry), function(e, br) { - err = e; - bytesRead = br; - }).read(true); - if (err) - throw err; - if (entry.method === consts.STORED) { - } else if (entry.method === consts.DEFLATED || entry.method === consts.ENHANCED_DEFLATED) { - data = zlib.inflateRawSync(data); - } else { - throw 'Unknown compression method: ' + entry.method; - } - if (data.length !== entry.size) - throw 'Invalid size'; - if (canVerifyCrc(entry)) { - var verify = new CrcVerify(entry.crc, entry.size); - verify.data(data); - } - return data; - }; - - function openEntry(entry, callback, sync) { - if (typeof entry === 'string') { - checkEntriesExist(); - entry = entries[entry]; - if (!entry) - return callback('Entry not found'); - } - if (!entry.isFile) - return callback('Entry is not file'); - if (!fd) - return callback('Archive closed'); - var buffer = new Buffer(consts.LOCHDR); - new FsRead(fd, buffer, 0, buffer.length, entry.offset, function(err) { - if (err) - return callback(err); - try { - entry.readDataHeader(buffer); - if (entry.encrypted) { - return callback('Entry encrypted'); - } - callback(null, entry); - } catch (ex) { - callback(ex); - } - }).read(sync); - } - - function dataOffset(entry) { - return entry.offset + consts.LOCHDR + entry.fnameLen + entry.extraLen; - } - - function canVerifyCrc(entry) { - // if bit 3 (0x08) of the general-purpose flags field is set, then the CRC-32 and file sizes are not known when the header is written - return (entry.flags & 0x8) != 0x8; - } - - function extract(entry, outPath, callback) { - that.stream(entry, function (err, stm) { - if (err) { - callback(err); - } else { - var fsStm, errThrown; - stm.on('error', function(err) { - errThrown = err; - if (fsStm) { - stm.unpipe(fsStm); - fsStm.close(function () { - callback(err); - }); - } - }); - fs.open(outPath, 'w', function(err, fdFile) { - if (err) - return callback(err || errThrown); - if (errThrown) { - fs.close(fd, function() { - callback(errThrown); - }); - return; - } - fsStm = fs.createWriteStream(outPath, { fd: fdFile }); - fsStm.on('finish', function() { - that.emit('extract', entry, outPath); - if (!errThrown) - callback(); - }); - stm.pipe(fsStm); - }); - } - }); - } - - function createDirectories(baseDir, dirs, callback) { - if (!dirs.length) - return callback(); - var dir = dirs.shift(); - dir = path.join(baseDir, path.join.apply(path, dir)); - fs.mkdir(dir, function(err) { - if (err && err.code !== 'EEXIST') - return callback(err); - createDirectories(baseDir, dirs, callback); - }); - } - - function extractFiles(baseDir, baseRelPath, files, callback, extractedCount) { - if (!files.length) - return callback(null, extractedCount); - var file = files.shift(); - var targetPath = path.join(baseDir, file.name.replace(baseRelPath, '')); - extract(file, targetPath, function (err) { - if (err) - return callback(err, extractedCount); - extractFiles(baseDir, baseRelPath, files, callback, extractedCount + 1); - }); - } - - this.extract = function(entry, outPath, callback) { - var entryName = entry || ''; - if (typeof entry === 'string') { - entry = this.entry(entry); - if (entry) { - entryName = entry.name; - } else { - if (entryName.length && entryName[entryName.length - 1] !== '/') - entryName += '/'; - } - } - if (!entry || entry.isDirectory) { - var files = [], dirs = [], allDirs = {}; - for (var e in entries) { - if (Object.prototype.hasOwnProperty.call(entries, e) && e.lastIndexOf(entryName, 0) === 0) { - var relPath = e.replace(entryName, ''); - var childEntry = entries[e]; - if (childEntry.isFile) { - files.push(childEntry); - relPath = path.dirname(relPath); - } - if (relPath && !allDirs[relPath] && relPath[0] !== '.') { - allDirs[relPath] = true; - var parts = relPath.split('/').filter(function (f) { return f; }); - if (parts.length) - dirs.push(parts); - } - } - } - dirs.sort(function(x, y) { return x.length - y.length; }); - if (dirs.length) { - createDirectories(outPath, dirs, function (err) { - if (err) - callback(err); - else - extractFiles(outPath, entryName, files, callback, 0); - }); - } else { - extractFiles(outPath, entryName, files, callback, 0); - } - } else { - fs.stat(outPath, function(err, stat) { - if (stat && stat.isDirectory()) - extract(entry, path.join(outPath, path.basename(entry.name)), callback); - else - extract(entry, outPath, callback); - }); - } - }; - - this.close = function() { - if (fd) { - fs.close(fd, function() { - fd = null; - }); - } - }; -}; - -util.inherits(StreamZip, events.EventEmitter); - -// endregion - -// region CentralDirectoryHeader - -var CentralDirectoryHeader = function() { -}; - -CentralDirectoryHeader.prototype.read = function(data) { - if (data.length != consts.ENDHDR || data.readUInt32LE(0) != consts.ENDSIG) - throw 'Invalid central directory'; - // number of entries on this volume - this.volumeEntries = data.readUInt16LE(consts.ENDSUB); - // total number of entries - this.totalEntries = data.readUInt16LE(consts.ENDTOT); - // central directory size in bytes - this.size = data.readUInt32LE(consts.ENDSIZ); - // offset of first CEN header - this.offset = data.readUInt32LE(consts.ENDOFF); - // zip file comment length - this.commentLength = data.readUInt16LE(consts.ENDCOM); -}; - -// endregion - -// region CentralDirectoryLoc64Header - -var CentralDirectoryLoc64Header = function() { -}; - -CentralDirectoryLoc64Header.prototype.read = function(data) { - if (data.length != consts.ENDL64HDR || data.readUInt32LE(0) != consts.ENDL64SIG) - throw 'Invalid zip64 central directory locator'; - // ZIP64 EOCD header offset - this.headerOffset = Util.readUInt64LE(data, consts.ENDSUB); -}; - -// endregion - -// region CentralDirectoryZip64Header - -var CentralDirectoryZip64Header = function() { -}; - -CentralDirectoryZip64Header.prototype.read = function(data) { - if (data.length != consts.END64HDR || data.readUInt32LE(0) != consts.END64SIG) - throw 'Invalid central directory'; - // number of entries on this volume - this.volumeEntries = Util.readUInt64LE(data, consts.END64SUB); - // total number of entries - this.totalEntries = Util.readUInt64LE(data, consts.END64TOT); - // central directory size in bytes - this.size = Util.readUInt64LE(data, consts.END64SIZ); - // offset of first CEN header - this.offset = Util.readUInt64LE(data, consts.END64OFF); -}; - -// endregion - -// region ZipEntry - -var ZipEntry = function() { -}; - -ZipEntry.prototype.readHeader = function(data, offset) { - // data should be 46 bytes and start with "PK 01 02" - if (data.length < offset + consts.CENHDR || data.readUInt32LE(offset) != consts.CENSIG) { - throw 'Invalid entry header'; - } - // version made by - this.verMade = data.readUInt16LE(offset + consts.CENVEM); - // version needed to extract - this.version = data.readUInt16LE(offset + consts.CENVER); - // encrypt, decrypt flags - this.flags = data.readUInt16LE(offset + consts.CENFLG); - // compression method - this.method = data.readUInt16LE(offset + consts.CENHOW); - // modification time (2 bytes time, 2 bytes date) - this.time = data.readUInt32LE(offset + consts.CENTIM); - // uncompressed file crc-32 value - this.crc = data.readUInt32LE(offset + consts.CENCRC); - // compressed size - this.compressedSize = data.readUInt32LE(offset + consts.CENSIZ); - // uncompressed size - this.size = data.readUInt32LE(offset + consts.CENLEN); - // filename length - this.fnameLen = data.readUInt16LE(offset + consts.CENNAM); - // extra field length - this.extraLen = data.readUInt16LE(offset + consts.CENEXT); - // file comment length - this.comLen = data.readUInt16LE(offset + consts.CENCOM); - // volume number start - this.diskStart = data.readUInt16LE(offset + consts.CENDSK); - // internal file attributes - this.inattr = data.readUInt16LE(offset + consts.CENATT); - // external file attributes - this.attr = data.readUInt32LE(offset + consts.CENATX); - // LOC header offset - this.offset = data.readUInt32LE(offset + consts.CENOFF); -}; - -ZipEntry.prototype.readDataHeader = function(data) { - // 30 bytes and should start with "PK\003\004" - if (data.readUInt32LE(0) != consts.LOCSIG) { - throw 'Invalid local header'; - } - // version needed to extract - this.version = data.readUInt16LE(consts.LOCVER); - // general purpose bit flag - this.flags = data.readUInt16LE(consts.LOCFLG); - // compression method - this.method = data.readUInt16LE(consts.LOCHOW); - // modification time (2 bytes time ; 2 bytes date) - this.time = data.readUInt32LE(consts.LOCTIM); - // uncompressed file crc-32 value - this.crc = data.readUInt32LE(consts.LOCCRC) || this.crc; - // compressed size - this.compressedSize = data.readUInt32LE(consts.LOCSIZ) || this.compressedSize; - // uncompressed size - this.size = data.readUInt32LE(consts.LOCLEN) || this.size; - // filename length - this.fnameLen = data.readUInt16LE(consts.LOCNAM); - // extra field length - this.extraLen = data.readUInt16LE(consts.LOCEXT); -}; - -ZipEntry.prototype.read = function(data, offset) { - this.name = data.slice(offset, offset += this.fnameLen).toString(); - var lastChar = data[offset - 1]; - this.isDirectory = (lastChar == 47) || (lastChar == 92); - - if (this.extraLen) { - this.readExtra(data, offset); - offset += this.extraLen; - } - this.comment = this.comLen ? data.slice(offset, offset + this.comLen).toString() : null; -}; - -ZipEntry.prototype.readExtra = function(data, offset) { - var signature, size, maxPos = offset + this.extraLen; - while (offset < maxPos) { - signature = data.readUInt16LE(offset); - offset += 2; - size = data.readUInt16LE(offset); - offset += 2; - if (consts.ID_ZIP64 === signature) { - this.parseZip64Extra(data, offset, size); - } - offset += size; - } -}; - -ZipEntry.prototype.parseZip64Extra = function(data, offset, length) { - if (length >= 8 && this.size === consts.EF_ZIP64_OR_32) { - this.size = Util.readUInt64LE(data, offset); - offset += 8; length -= 8; - } - if (length >= 8 && this.compressedSize === consts.EF_ZIP64_OR_32) { - this.compressedSize = Util.readUInt64LE(data, offset); - offset += 8; length -= 8; - } - if (length >= 8 && this.offset === consts.EF_ZIP64_OR_32) { - this.offset = Util.readUInt64LE(data, offset); - offset += 8; length -= 8; - } - if (length >= 4 && this.diskStart === consts.EF_ZIP64_OR_16) { - this.diskStart = data.readUInt32LE(offset); - // offset += 4; length -= 4; - } -}; - -Object.defineProperty(ZipEntry.prototype, 'encrypted', { - get: function() { return (this.flags & consts.FLG_ENTRY_ENC) == consts.FLG_ENTRY_ENC; } -}); - -Object.defineProperty(ZipEntry.prototype, 'isFile', { - get: function() { return !this.isDirectory; } -}); - -// endregion - -// region FsRead - -var FsRead = function(fd, buffer, offset, length, position, callback) { - this.fd = fd; - this.buffer = buffer; - this.offset = offset; - this.length = length; - this.position = position; - this.callback = callback; - this.bytesRead = 0; - this.waiting = false; -}; - -FsRead.prototype.read = function(sync) { - //console.log('read', this.position, this.bytesRead, this.length, this.offset); - this.waiting = true; - if (sync) { - try { - var bytesRead = fs.readSync(this.fd, this.buffer, this.offset + this.bytesRead, - this.length - this.bytesRead, this.position + this.bytesRead); - this.readCallback(sync, null, bytesRead); - } catch (err) { - this.readCallback(sync, err, null); - } - } else { - fs.read(this.fd, this.buffer, this.offset + this.bytesRead, - this.length - this.bytesRead, this.position + this.bytesRead, - this.readCallback.bind(this, sync)); - } -}; - -FsRead.prototype.readCallback = function(sync, err, bytesRead) { - if (typeof bytesRead === 'number') - this.bytesRead += bytesRead; - if (err || !bytesRead || this.bytesRead === this.length) { - this.waiting = false; - return this.callback(err, this.bytesRead); - } else { - this.read(sync); - } -}; - -// endregion - -// region FileWindowBuffer - -var FileWindowBuffer = function(fd) { - this.position = 0; - this.buffer = new Buffer(0); - - var fsOp = null; - - this.checkOp = function() { - if (fsOp && fsOp.waiting) - throw 'Operation in progress'; - }; - - this.read = function(pos, length, callback) { - this.checkOp(); - if (this.buffer.length < length) - this.buffer = new Buffer(length); - this.position = pos; - fsOp = new FsRead(fd, this.buffer, 0, length, this.position, callback).read(); - }; - - this.expandLeft = function(length, callback) { - this.checkOp(); - this.buffer = Buffer.concat([new Buffer(length), this.buffer]); - this.position -= length; - if (this.position < 0) - this.position = 0; - fsOp = new FsRead(fd, this.buffer, 0, length, this.position, callback).read(); - }; - - this.expandRight = function(length, callback) { - this.checkOp(); - var offset = this.buffer.length; - this.buffer = Buffer.concat([this.buffer, new Buffer(length)]); - fsOp = new FsRead(fd, this.buffer, offset, length, this.position + offset, callback).read(); - }; - - this.moveRight = function(length, callback, shift) { - this.checkOp(); - if (shift) { - this.buffer.copy(this.buffer, 0, shift); - } else { - shift = 0; - } - this.position += shift; - fsOp = new FsRead(fd, this.buffer, this.buffer.length - shift, shift, this.position + this.buffer.length - shift, callback).read(); - }; -}; - -// endregion - -// region EntryDataReaderStream - -var EntryDataReaderStream = function(fd, offset, length) { - stream.Readable.prototype.constructor.call(this); - this.fd = fd; - this.offset = offset; - this.length = length; - this.pos = 0; - this.readCallback = this.readCallback.bind(this); -}; - -util.inherits(EntryDataReaderStream, stream.Readable); - -EntryDataReaderStream.prototype._read = function(n) { - var buffer = new Buffer(Math.min(n, this.length - this.pos)); - if (buffer.length) { - fs.read(this.fd, buffer, 0, buffer.length, this.offset + this.pos, this.readCallback); - } else { - this.push(null); - } -}; - -EntryDataReaderStream.prototype.readCallback = function(err, bytesRead, buffer) { - this.pos += bytesRead; - if (err) { - this.emit('error', err); - this.push(null); - } else if (!bytesRead) { - this.push(null); - } else { - if (bytesRead !== buffer.length) - buffer = buffer.slice(0, bytesRead); - this.push(buffer); - } -}; - -// endregion - -// region EntryVerifyStream - -var EntryVerifyStream = function(baseStm, crc, size) { - stream.Transform.prototype.constructor.call(this); - this.verify = new CrcVerify(crc, size); - var that = this; - baseStm.on('error', function(e) { - that.emit('error', e); - }); -}; - -util.inherits(EntryVerifyStream, stream.Transform); - -EntryVerifyStream.prototype._transform = function(data, encoding, callback) { - try { - this.verify.data(data); - callback(null, data); - } catch (err) { - callback(err, data); - } -}; - -// endregion - -// region CrcVerify - -var CrcVerify = function(crc, size) { - this.crc = crc; - this.size = size; - this.state = { - crc: ~0, - size: 0 - }; -}; - -CrcVerify.prototype.data = function(data) { - var crcTable = CrcVerify.getCrcTable(); - var crc = this.state.crc, off = 0, len = data.length; - while (--len >= 0) - crc = crcTable[(crc ^ data[off++]) & 0xff] ^ (crc >>> 8); - this.state.crc = crc; - this.state.size += data.length; - if (this.state.size >= this.size) { - var buf = new Buffer(4); - buf.writeInt32LE(~this.state.crc & 0xffffffff, 0); - crc = buf.readUInt32LE(0); - if (crc !== this.crc) - throw 'Invalid CRC'; - if (this.state.size !== this.size) - throw 'Invalid size'; - } -}; - -CrcVerify.getCrcTable = function() { - var crcTable = CrcVerify.crcTable; - if (!crcTable) { - CrcVerify.crcTable = crcTable = []; - var b = new Buffer(4); - for (var n = 0; n < 256; n++) { - var c = n; - for (var k = 8; --k >= 0; ) - if ((c & 1) != 0) { c = 0xedb88320 ^ (c >>> 1); } else { c = c >>> 1; } - if (c < 0) { - b.writeInt32LE(c, 0); - c = b.readUInt32LE(0); - } - crcTable[n] = c; - } - } - return crcTable; -}; - -// endregion - -// region Util - -var Util = { - readUInt64LE: function(buffer, offset) { - return (buffer.readUInt32LE(offset + 4) * 0x0000000100000000) + buffer.readUInt32LE(offset); - } -}; - -// endregion - -// region exports - -module.exports = StreamZip; - -// endregion diff --git a/sources/node_modules/node-stream-zip/package.json b/sources/node_modules/node-stream-zip/package.json deleted file mode 100644 index 55d3136..0000000 --- a/sources/node_modules/node-stream-zip/package.json +++ /dev/null @@ -1,91 +0,0 @@ -{ - "_args": [ - [ - "node-stream-zip@^1.3.3", - "/Users/Antelle/Documents/Proj/keeweb/electron" - ] - ], - "_from": "node-stream-zip@>=1.3.3 <2.0.0", - "_id": "node-stream-zip@1.3.3", - "_inCache": true, - "_installable": true, - "_location": "/node-stream-zip", - "_nodeVersion": "5.7.1", - "_npmOperationalInternal": { - "host": "packages-12-west.internal.npmjs.com", - "tmp": "tmp/node-stream-zip-1.3.3.tgz_1459876107672_0.010327554773539305" - }, - "_npmUser": { - "email": "antelle.net@gmail.com", - "name": "antelle" - }, - "_npmVersion": "3.6.0", - "_phantomChildren": {}, - "_requested": { - "name": "node-stream-zip", - "raw": "node-stream-zip@^1.3.3", - "rawSpec": "^1.3.3", - "scope": null, - "spec": ">=1.3.3 <2.0.0", - "type": "range" - }, - "_requiredBy": [ - "/" - ], - "_shasum": "0094360b2074ae8926d43df0eef976d3897d7207", - "_shrinkwrap": null, - "_spec": "node-stream-zip@^1.3.3", - "_where": "/Users/Antelle/Documents/Proj/keeweb/electron", - "author": { - "email": "antelle.net@gmail.com", - "name": "Antelle", - "url": "https://github.com/antelle" - }, - "bugs": { - "email": "antelle.net@gmail.com", - "url": "https://github.com/antelle/node-stream-zip/issues" - }, - "dependencies": {}, - "description": "node.js library for reading and extraction of ZIP archives", - "devDependencies": { - "nodeunit": "^0.9.1" - }, - "directories": {}, - "dist": { - "shasum": "0094360b2074ae8926d43df0eef976d3897d7207", - "tarball": "https://registry.npmjs.org/node-stream-zip/-/node-stream-zip-1.3.3.tgz" - }, - "engines": { - "node": ">=0.10.0" - }, - "files": [ - "node_stream_zip.js" - ], - "gitHead": "269a5cb11f44823e858872b36d6f518406e8bcc2", - "homepage": "https://github.com/antelle/node-stream-zip", - "keywords": [ - "archive", - "stream", - "unzip", - "zip" - ], - "license": "MIT", - "main": "node_stream_zip.js", - "maintainers": [ - { - "name": "antelle", - "email": "antelle.net@gmail.com" - } - ], - "name": "node-stream-zip", - "optionalDependencies": {}, - "readme": "ERROR: No README data found!", - "repository": { - "type": "git", - "url": "git+https://github.com/antelle/node-stream-zip.git" - }, - "scripts": { - "test": "nodeunit test/tests.js" - }, - "version": "1.3.3" -} diff --git a/sources/package.json b/sources/package.json deleted file mode 100644 index 2a9d3fd..0000000 --- a/sources/package.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "name": "KeeWeb", - "version": "1.1.4", - "description": "KeePass web app", - "main": "main.js", - "repository": "https://github.com/antelle/keeweb", - "author": "Antelle", - "license": "MIT", - "readme": "../README.md", - "dependencies": { - "node-stream-zip": "^1.3.3" - } -} From 98f3f0801209cd98f7fb752264cf80977f4d27b7 Mon Sep 17 00:00:00 2001 From: scith Date: Tue, 6 Dec 2016 03:09:26 +0100 Subject: [PATCH 2/5] Readme --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 9238692..1d147b5 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,11 @@ Web client for reading and editing Keepass files locally. It can also sync with ## Usage for Dropbox sync ## 1. [create](https://www.dropbox.com/developers/apps/create) a Dropbox app 2. find your app key (in Dropbox App page, go to Settings/App key) +3. Enter the app key when prompted +## Add default files on your homepage ## +1. Read https://github.com/keeweb/keeweb/wiki/Configuration#json-app-config +2. In your config.json add the "files" entry with the appropriate settings **More information on the documentation page:** https://keeweb.info/ From 2eee26f75a627d3beb082d3ea7cf98fded27490f Mon Sep 17 00:00:00 2001 From: scith Date: Tue, 6 Dec 2016 03:14:26 +0100 Subject: [PATCH 3/5] Fix upgrade --- scripts/upgrade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index cbe3e18..0bce5a0 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -40,9 +40,9 @@ app=$YNH_APP_INSTANCE_NAME # Migrate old apps if [ "$is_public" = "Yes" ]; then - ynh_app_setting_set "$app" is_public "true" + ynh_app_setting_set "$app" is_public "1" elif [ "$is_public" = "No" ]; then - ynh_app_setting_set "$app" is_public "false" + ynh_app_setting_set "$app" is_public "0" fi # If app is public, add url to SSOWat conf as skipped_uris From d40c36b2cc9697f3906e46999c4b24bd3f4338fd Mon Sep 17 00:00:00 2001 From: scith Date: Tue, 6 Dec 2016 03:16:17 +0100 Subject: [PATCH 4/5] Fix upgrade --- scripts/upgrade | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/upgrade b/scripts/upgrade index 0bce5a0..a3c07a5 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -41,8 +41,10 @@ app=$YNH_APP_INSTANCE_NAME # Migrate old apps if [ "$is_public" = "Yes" ]; then ynh_app_setting_set "$app" is_public "1" + is_public=$(ynh_app_setting_get "$app" is_public) elif [ "$is_public" = "No" ]; then ynh_app_setting_set "$app" is_public "0" + is_public=$(ynh_app_setting_get "$app" is_public) fi # If app is public, add url to SSOWat conf as skipped_uris From e0231aee5d471d25caaacc3f59f8977ea5a6ef05 Mon Sep 17 00:00:00 2001 From: scith Date: Tue, 6 Dec 2016 03:21:37 +0100 Subject: [PATCH 5/5] Check process --- check_process | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 check_process diff --git a/check_process b/check_process new file mode 100644 index 0000000..3ec8438 --- /dev/null +++ b/check_process @@ -0,0 +1,23 @@ +;; Full test on Keeweb + auto_remove=1 + ; Manifest + domain="domain.tld" (DOMAIN) + path="/path" (PATH) + is_public=1 (PUBLIC|public=1|private=0) + ; Checks + pkg_linter=1 + setup_sub_dir=1 + setup_root=1 + setup_nourl=0 + setup_private=1 + setup_public=1 + upgrade=1 + backup_restore=1 + multi_instance=1 + wrong_user=0 + wrong_path=1 + incorrect_path=1 + corrupt_source=0 + fail_download_source=0 + port_already_use=0 + final_path_already_use=0 \ No newline at end of file