Merge pull request #196 from Tzahi12345/remove-use-encryption-settings

Removed "use encryption" options
5 years ago · 3faf715b88
parent eb7fdb649d eda75e9a19
commit 3faf715b88
8 changed files with 6 additions and 140 deletions
--- 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

--- 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 = {
--- 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/",
--- a/backend/appdata/encrypted.json
+++ b/backend/appdata/encrypted.json
@ -1,56 +0,0 @@
-{
-    "YoutubeDLMaterial": {
-      "Host": {
-        "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/",
-        "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"
-      }
-    }
-  }
--- 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/",
--- 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',
--- a/src/app/settings/settings.component.html
+++ b/src/app/settings/settings.component.html
@ -42,26 +42,6 @@
                </div>
            </div>
            <mat-divider></mat-divider>
-            <div *ngIf="new_config" class="container-fluid">
-                <div class="row">
-                    <div class="col-12 mt-3">
-                        <mat-checkbox color="accent" [(ngModel)]="new_config['Encryption']['use-encryption']"><ng-container i18n="Use encryption setting">Use encryption</ng-container></mat-checkbox>
-                    </div>
-
-                    <div class="col-12">
-                        <mat-form-field class="text-field" color="accent">
-                            <input [disabled]="!new_config['Encryption']['use-encryption']" [(ngModel)]="new_config['Encryption']['cert-file-path']" matInput placeholder="Cert file path" i18n-placeholder="Cert file path input placeholder">
-                        </mat-form-field>
-                    </div>
-
-                    <div class="col-12">
-                        <mat-form-field class="text-field" color="accent">
-                            <input [disabled]="!new_config['Encryption']['use-encryption']" [(ngModel)]="new_config['Encryption']['key-file-path']" matInput placeholder="Key file path" i18n-placeholder="Key file path input placeholder">
-                        </mat-form-field>
-                    </div>
-                </div>
-            </div>
-            <mat-divider></mat-divider>
            <div *ngIf="new_config" class="container-fluid">
                <div class="row">
                    <div class="col-12 mt-3">
@ -73,7 +53,7 @@
                            <mat-hint><ng-container i18n="Subscriptions base path setting input hint">Base path for videos from your subscribed channels and playlists. It is relative to YTDL-Material's root folder.</ng-container></mat-hint>
                        </mat-form-field>
                    </div>
-                    <div class="col-12 mt-5">
+                    <div class="col-12 mt-5 mb-3">
                        <mat-form-field class="text-field" color="accent">
                            <input [disabled]="!new_config['Subscriptions']['allow_subscriptions']" [(ngModel)]="new_config['Subscriptions']['subscriptions_check_interval']" matInput placeholder="Check interval" i18n-placeholder="Check interval input setting placeholder">
                            <mat-hint><ng-container i18n="Check interval setting input hint">Unit is seconds, only include numbers.</ng-container></mat-hint>
--- 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/",