From 560aaadca131ac2f0f809b4803af9856f5a0f702 Mon Sep 17 00:00:00 2001 From: Isaac Abadi Date: Fri, 14 Aug 2020 17:56:44 -0400 Subject: [PATCH 1/2] Removed "use encryption" options, if you'd like to encrypt your web page, use a reverse proxy --- backend/app.js | 37 +++--------------------- backend/appdata/default.json | 5 ---- backend/appdata/encrypted.json | 5 ---- backend/config.js | 5 ---- backend/consts.js | 14 --------- src/app/settings/settings.component.html | 22 +------------- src/assets/default.json | 5 ---- 7 files changed, 5 insertions(+), 88 deletions(-) diff --git a/backend/app.js b/backend/app.js index c6cddc5..1fa6d5e 100644 --- a/backend/app.js +++ b/backend/app.js @@ -128,7 +128,6 @@ users_db.defaults( var frontendUrl = null; var backendUrl = null; var backendPort = null; -var usingEncryption = null; var basePath = null; var audioFolderPath = null; var videoFolderPath = null; @@ -140,7 +139,6 @@ var subscriptionsCheckInterval = null; var archivePath = path.join(__dirname, 'appdata', 'archives'); // other needed values -var options = null; // encryption options var url_domain = null; var updaterStatus = null; @@ -256,18 +254,10 @@ async function startServer() { // set config to port await setPortItemFromENV(); } - if (usingEncryption) - { - https.createServer(options, app).listen(backendPort, function() { - logger.info(`YoutubeDL-Material ${CONSTS['CURRENT_VERSION']} started on port ${backendPort} - using SSL`); - }); - } - else - { - app.listen(backendPort,function(){ - logger.info(`YoutubeDL-Material ${CONSTS['CURRENT_VERSION']} started on PORT ${backendPort}`); - }); - } + + app.listen(backendPort,function(){ + logger.info(`YoutubeDL-Material ${CONSTS['CURRENT_VERSION']} started on PORT ${backendPort}`); + }); } async function restartServer() { @@ -604,7 +594,6 @@ async function loadConfig() { function loadConfigValues() { url = !debugMode ? config_api.getConfigItem('ytdl_url') : 'http://localhost:4200'; backendPort = config_api.getConfigItem('ytdl_port'); - usingEncryption = config_api.getConfigItem('ytdl_use_encryption'); audioFolderPath = config_api.getConfigItem('ytdl_audio_folder_path'); videoFolderPath = config_api.getConfigItem('ytdl_video_folder_path'); downloadOnlyMode = config_api.getConfigItem('ytdl_download_only_mode'); @@ -619,20 +608,6 @@ function loadConfigValues() { customDownloadingAgent = null; } - if (usingEncryption) - { - var certFilePath = path.resolve(config_api.getConfigItem('ytdl_cert_file_path')); - var keyFilePath = path.resolve(config_api.getConfigItem('ytdl_key_file_path')); - - var certKeyFile = fs.readFileSync(keyFilePath); - var certFile = fs.readFileSync(certFilePath); - - options = { - key: certKeyFile, - cert: certFile - }; - } - // empty url defaults to default URL if (!url || url === '') url = 'http://example.com' url_domain = new URL(url); @@ -1828,10 +1803,6 @@ app.post('/api/setConfig', optionalJwt, function(req, res) { }); -app.get('/api/using-encryption', function(req, res) { - res.send(usingEncryption); -}); - app.post('/api/tomp3', optionalJwt, async function(req, res) { var url = req.body.url; var options = { diff --git a/backend/appdata/default.json b/backend/appdata/default.json index 3803b0d..b1f7e30 100644 --- a/backend/appdata/default.json +++ b/backend/appdata/default.json @@ -4,11 +4,6 @@ "url": "http://example.com", "port": "17442" }, - "Encryption": { - "use-encryption": false, - "cert-file-path": "/etc/letsencrypt/live/example.com/fullchain.pem", - "key-file-path": "/etc/letsencrypt/live/example.com/privkey.pem" - }, "Downloader": { "path-audio": "audio/", "path-video": "video/", diff --git a/backend/appdata/encrypted.json b/backend/appdata/encrypted.json index c1336cd..9a89d65 100644 --- a/backend/appdata/encrypted.json +++ b/backend/appdata/encrypted.json @@ -4,11 +4,6 @@ "url": "https://example.com", "port": "17442" }, - "Encryption": { - "use-encryption": true, - "cert-file-path": "/etc/letsencrypt/live/example.com/fullchain.pem", - "key-file-path": "/etc/letsencrypt/live/example.com/privkey.pem" - }, "Downloader": { "path-audio": "audio/", "path-video": "video/", diff --git a/backend/config.js b/backend/config.js index d96d97f..0ff9bd4 100644 --- a/backend/config.js +++ b/backend/config.js @@ -181,11 +181,6 @@ DEFAULT_CONFIG = { "url": "http://example.com", "port": "17442" }, - "Encryption": { - "use-encryption": false, - "cert-file-path": "/etc/letsencrypt/live/example.com/fullchain.pem", - "key-file-path": "/etc/letsencrypt/live/example.com/privkey.pem" - }, "Downloader": { "path-audio": "audio/", "path-video": "video/", diff --git a/backend/consts.js b/backend/consts.js index cdd1d0a..ff0b033 100644 --- a/backend/consts.js +++ b/backend/consts.js @@ -9,20 +9,6 @@ let CONFIG_ITEMS = { 'path': 'YoutubeDLMaterial.Host.port' }, - // Encryption - 'ytdl_use_encryption': { - 'key': 'ytdl_use_encryption', - 'path': 'YoutubeDLMaterial.Encryption.use-encryption' - }, - 'ytdl_cert_file_path': { - 'key': 'ytdl_cert_file_path', - 'path': 'YoutubeDLMaterial.Encryption.cert-file-path' - }, - 'ytdl_key_file_path': { - 'key': 'ytdl_key_file_path', - 'path': 'YoutubeDLMaterial.Encryption.key-file-path' - }, - // Downloader 'ytdl_audio_folder_path': { 'key': 'ytdl_audio_folder_path', diff --git a/src/app/settings/settings.component.html b/src/app/settings/settings.component.html index 6f81eca..a48e81a 100644 --- a/src/app/settings/settings.component.html +++ b/src/app/settings/settings.component.html @@ -42,26 +42,6 @@ -
-
-
- Use encryption -
- -
- - - -
- -
- - - -
-
-
-
@@ -73,7 +53,7 @@ Base path for videos from your subscribed channels and playlists. It is relative to YTDL-Material's root folder.
-
+
Unit is seconds, only include numbers. diff --git a/src/assets/default.json b/src/assets/default.json index 7bb8d00..e03372b 100644 --- a/src/assets/default.json +++ b/src/assets/default.json @@ -4,11 +4,6 @@ "url": "http://localhost", "port": "17442" }, - "Encryption": { - "use-encryption": false, - "cert-file-path": "/etc/letsencrypt/live/example.com/fullchain.pem", - "key-file-path": "/etc/letsencrypt/live/example.com/privkey.pem" - }, "Downloader": { "path-audio": "audio/", "path-video": "video/", From eda75e9a1950303d39807570cac1b9e3fe4d409e Mon Sep 17 00:00:00 2001 From: Isaac Abadi Date: Fri, 14 Aug 2020 18:00:14 -0400 Subject: [PATCH 2/2] Updated docs and removed deprecated encrypted.json file from repo --- README.md | 2 +- backend/appdata/encrypted.json | 51 ---------------------------------- 2 files changed, 1 insertion(+), 52 deletions(-) delete mode 100644 backend/appdata/encrypted.json diff --git a/README.md b/README.md index 2249166..65486db 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ Optional dependencies: 1. First, download the [latest release](https://github.com/Tzahi12345/YoutubeDL-Material/releases/latest)! -2. Drag the `youtubedl-material` directory to an easily accessible directory. Navigate to the `appdata` folder and edit the `default.json` file. If you're using SSL encryption, look at the `encrypted.json` file for a template. +2. Drag the `youtubedl-material` directory to an easily accessible directory. Navigate to the `appdata` folder and edit the `default.json` file. NOTE: If you are intending to use a [reverse proxy](https://github.com/Tzahi12345/YoutubeDL-Material/wiki/Reverse-Proxy-Setup), this next step is not necessary diff --git a/backend/appdata/encrypted.json b/backend/appdata/encrypted.json deleted file mode 100644 index 9a89d65..0000000 --- a/backend/appdata/encrypted.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "YoutubeDLMaterial": { - "Host": { - "url": "https://example.com", - "port": "17442" - }, - "Downloader": { - "path-audio": "audio/", - "path-video": "video/", - "use_youtubedl_archive": false, - "custom_args": "", - "safe_download_override": false - }, - "Extra": { - "title_top": "YoutubeDL-Material", - "file_manager_enabled": true, - "allow_quality_select": true, - "download_only_mode": false, - "allow_multi_download_mode": true, - "enable_downloads_manager": true - }, - "API": { - "use_API_key": false, - "API_key": "", - "use_youtube_API": false, - "youtube_API_key": "" - }, - "Themes": { - "default_theme": "default", - "allow_theme_change": true - }, - "Subscriptions": { - "allow_subscriptions": true, - "subscriptions_base_path": "subscriptions/", - "subscriptions_check_interval": "300" - }, - "Users": { - "base_path": "users/", - "allow_registration": true - }, - "Advanced": { - "use_default_downloading_agent": true, - "custom_downloading_agent": "", - "multi_user_mode": false, - "allow_advanced_download": false, - "use_cookies": false, - "jwt_expiration": 86400, - "logger_level": "info" - } - } - }