From 04ec33fad5ab7cd5d5a691932869bfa84dd45184 Mon Sep 17 00:00:00 2001 From: Michatec Date: Mon, 10 Aug 2026 22:39:53 +0200 Subject: [PATCH] feat(remote-control): implement authentication for remote control access and update API documentation --- app/src/main/assets/web/index.html | 12 +++- app/src/main/assets/web/script.js | 71 +++++++++++++++---- app/src/main/assets/web/style.css | 11 +++ app/src/main/assets/web/translations.json | 30 +++++--- app/src/main/java/com/michatec/radio/Keys.kt | 3 + .../java/com/michatec/radio/MainActivity.kt | 43 ++++++----- .../java/com/michatec/radio/PlayerService.kt | 8 +++ .../com/michatec/radio/SettingsFragment.kt | 42 ++++++++++- .../radio/helpers/PreferencesHelper.kt | 27 +++++++ .../radio/helpers/RemoteControlServer.kt | 42 ++++++++++- app/src/main/res/values-da/strings.xml | 7 ++ app/src/main/res/values-de/strings.xml | 7 ++ app/src/main/res/values-el/strings.xml | 7 ++ app/src/main/res/values-fr/strings.xml | 7 ++ app/src/main/res/values-ja/strings.xml | 7 ++ app/src/main/res/values-nl/strings.xml | 9 ++- app/src/main/res/values-pl/strings.xml | 7 ++ app/src/main/res/values-ru/strings.xml | 7 ++ app/src/main/res/values-uk/strings.xml | 7 ++ app/src/main/res/values/strings.xml | 7 ++ 20 files changed, 318 insertions(+), 43 deletions(-) diff --git a/app/src/main/assets/web/index.html b/app/src/main/assets/web/index.html index 7d62d77..d12a2eb 100644 --- a/app/src/main/assets/web/index.html +++ b/app/src/main/assets/web/index.html @@ -50,6 +50,15 @@

The Radio app provides a REST API to control playback and query information.

+
+

Authentication

+

If authentication is enabled in the app settings, you must include the pairing code in your requests:

+
    +
  • HTTP Headers: Add X-Remote-Key: YOUR_CODE
  • +
  • Query Parameter: Add ?token=YOUR_CODE (fallback for images and WebSockets)
  • +
+
+

API Reference

@@ -72,7 +81,8 @@

WebSocket endpoint for real-time status updates. Pushes status objects whenever state or metadata changes.

Example Usage (JavaScript):
-const socket = new WebSocket('ws://' + location.host + '/api/updates');
+const token = '123456'; // From app settings
+const socket = new WebSocket('ws://' + location.host + '/api/updates?token=' + token);
 socket.onmessage = (event) => {
   const status = JSON.parse(event.data);
   console.log('Update received:', status);
diff --git a/app/src/main/assets/web/script.js b/app/src/main/assets/web/script.js
index fde3af0..fa77e68 100644
--- a/app/src/main/assets/web/script.js
+++ b/app/src/main/assets/web/script.js
@@ -5,6 +5,7 @@ let isUpdating = false;
 let stationsLoaded = false;
 let lastStatusData = null;
 let updateSocket = null;
+let authToken = localStorage.getItem('radio-remote-token') || '';
 const STATE_IDLE = 1;
 const STATE_BUFFERING = 2;
 const STATE_READY = 3;
@@ -79,9 +80,14 @@ function updateStatusUI(data) {
         if (currentStarEl) currentStarEl.classList.toggle('hidden', !data.starred);
         if (currentMetadataEl) currentMetadataEl.innerText = data.metadata || "";
         if (currentImageEl) {
-            const imageUrl = station.hasImage ? '/api/image/' + station.uuid : 'favicon.png';
-            const cacheBuster = station.lastModified ? '?t=' + station.lastModified : '';
-            currentImageEl.src = imageUrl + cacheBuster;
+            let imageUrl = station.hasImage ? '/api/image/' + station.uuid : 'favicon.png';
+            if (station.hasImage && authToken) {
+                imageUrl += '?token=' + encodeURIComponent(authToken);
+                imageUrl += station.lastModified ? '&t=' + station.lastModified : '';
+            } else if (station.hasImage) {
+                imageUrl += station.lastModified ? '?t=' + station.lastModified : '';
+            }
+            currentImageEl.src = imageUrl;
         }
     } else {
         if (stationsLoaded) {
@@ -112,10 +118,40 @@ function updateStatusUI(data) {
     }
 }
 
+async function apiFetch(url, options = {}) {
+    if (authToken) {
+        options.headers = options.headers || {};
+        options.headers['X-Remote-Key'] = authToken;
+    }
+
+    let response = await fetch(url, options);
+
+    if (response.status === 401) {
+        const code = prompt(t('prompt_pairing_code') || "Please enter the pairing code:");
+        if (code) {
+            authToken = code;
+            localStorage.setItem('radio-remote-token', authToken);
+            options.headers = options.headers || {};
+            options.headers['X-Remote-Key'] = authToken;
+            response = await fetch(url, options);
+            if (response.ok) {
+                window.location.reload();
+            } else if (response.status === 401) {
+                authToken = '';
+                localStorage.removeItem('radio-remote-token');
+            }
+        } else {
+            authToken = '';
+            localStorage.removeItem('radio-remote-token');
+        }
+    }
+    return response;
+}
+
 async function updateStatus() {
     if (isUpdating) return;
     try {
-        const response = await fetch('/api/status');
+        const response = await apiFetch('/api/status');
         const data = await response.json();
         if (!response.ok) {
             updateStatusUI({ error: data.error || "Service Unavailable" });
@@ -134,7 +170,10 @@ function initUpdateSocket() {
     }
 
     const protocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:';
-    const wsUrl = protocol + '//' + window.location.host + '/api/updates';
+    let wsUrl = protocol + '//' + window.location.host + '/api/updates';
+    if (authToken) {
+        wsUrl += '?token=' + encodeURIComponent(authToken);
+    }
 
     updateSocket = new WebSocket(wsUrl);
 
@@ -165,7 +204,7 @@ function initUpdateSocket() {
 
 async function loadStations() {
     try {
-        const response = await fetch('/api/stations');
+        const response = await apiFetch('/api/stations');
         if (!response.ok) {
             document.getElementById('stationList').innerText = t('status_error');
             stationsLoaded = true;
@@ -202,8 +241,14 @@ function renderStationList() {
             const img = document.createElement('img');
             img.className = 'station-img';
             if (station.hasImage) {
-                const cacheBuster = station.lastModified ? '?t=' + station.lastModified : '';
-                img.src = '/api/image/' + station.uuid + cacheBuster;
+                let imageUrl = '/api/image/' + station.uuid;
+                if (authToken) {
+                    imageUrl += '?token=' + encodeURIComponent(authToken);
+                    imageUrl += station.lastModified ? '&t=' + station.lastModified : '';
+                } else {
+                    imageUrl += station.lastModified ? '?t=' + station.lastModified : '';
+                }
+                img.src = imageUrl;
             } else {
                 img.src = 'favicon.png';
             }
@@ -252,7 +297,7 @@ async function playStation(uuid) {
     }
 
     try {
-        await fetch('/api/play/' + uuid, { method: 'POST' });
+        await apiFetch('/api/play/' + uuid, { method: 'POST' });
     } catch (e) { console.error(e); }
 }
 
@@ -265,18 +310,18 @@ document.getElementById('playPauseBtn').onclick = async () => {
 
     try {
         if (isPlaying) {
-            await fetch('/api/pause', { method: 'POST' });
+            await apiFetch('/api/pause', { method: 'POST' });
         } else {
-            await fetch('/api/resume', { method: 'POST' });
+            await apiFetch('/api/resume', { method: 'POST' });
         }
     } catch (e) { console.error(e); }
 };
 
 document.getElementById('prevBtn').onclick = () => {
-    fetch('/api/prev', { method: 'POST' });
+    apiFetch('/api/prev', { method: 'POST' });
 };
 document.getElementById('nextBtn').onclick = () => {
-    fetch('/api/next', { method: 'POST' });
+    apiFetch('/api/next', { method: 'POST' });
 };
 
 function applyThemeUI(theme) {
diff --git a/app/src/main/assets/web/style.css b/app/src/main/assets/web/style.css
index 242aa52..499e2d8 100644
--- a/app/src/main/assets/web/style.css
+++ b/app/src/main/assets/web/style.css
@@ -261,6 +261,17 @@ body.light-theme .station-item {
     overflow-x: auto;
 }
 
+.auth-box {
+    margin: 20px 0;
+    padding: 20px;
+    border: 1px solid var(--accent-color);
+    box-shadow: 0 0 10px rgba(0, 132, 255, 0.2);
+}
+
+.auth-box h3 { margin-top: 0; color: var(--accent-color); }
+.auth-box ul { padding-left: 20px; margin-bottom: 0; }
+.auth-box li { margin-bottom: 8px; }
+
 body.light-theme .api-content pre {
     background: #f8f9fa;
     color: #0066cc;
diff --git a/app/src/main/assets/web/translations.json b/app/src/main/assets/web/translations.json
index 3b49173..2e3237b 100644
--- a/app/src/main/assets/web/translations.json
+++ b/app/src/main/assets/web/translations.json
@@ -22,7 +22,8 @@
     "theme_dark": "Dark",
     "theme_follow_browser": "Follow Browser",
     "lang_auto_browser": "Auto (Browser)",
-    "api_docs": "API Documentation"
+    "api_docs": "API Documentation",
+    "prompt_pairing_code": "Please enter the pairing code:"
   },
   "de": {
     "title": "Radio Fernbedienung",
@@ -47,7 +48,8 @@
     "theme_dark": "Dunkel",
     "theme_follow_browser": "Browser folgen",
     "lang_auto_browser": "Auto (Browser)",
-    "api_docs": "API Dokumentation"
+    "api_docs": "API Dokumentation",
+    "prompt_pairing_code": "Bitte geben Sie den Pairing-Code ein:"
   },
   "fr": {
     "title": "Télécommande Radio",
@@ -72,7 +74,8 @@
     "theme_dark": "Sombre",
     "theme_follow_browser": "Suivre le Navigateur",
     "lang_auto_browser": "Auto (Navigateur)",
-    "api_docs": "Documentation API"
+    "api_docs": "Documentation API",
+    "prompt_pairing_code": "Veuillez saisir le code de couplage :"
   },
   "ru": {
     "title": "Пульт Радио",
@@ -97,7 +100,8 @@
     "theme_dark": "Темная",
     "theme_follow_browser": "Как в браузере",
     "lang_auto_browser": "Авто (Браузер)",
-    "api_docs": "Документация API"
+    "api_docs": "Документация API",
+    "prompt_pairing_code": "Введите код сопряжения:"
   },
   "nl": {
     "title": "Radio Afstandsbediening",
@@ -122,7 +126,8 @@
     "theme_dark": "Donker",
     "theme_follow_browser": "Browser volgen",
     "lang_auto_browser": "Auto (Browser)",
-    "api_docs": "API Documentatie"
+    "api_docs": "API Documentatie",
+    "prompt_pairing_code": "Voer de koppelingscode in:"
   },
   "pl": {
     "title": "Pilot Radio",
@@ -147,7 +152,8 @@
     "theme_dark": "Ciemny",
     "theme_follow_browser": "Podążaj za przeglądarką",
     "lang_auto_browser": "Auto (Przeglądarkα)",
-    "api_docs": "Dokumentacja API"
+    "api_docs": "Dokumentacja API",
+    "prompt_pairing_code": "Wprowadź kod parowania:"
   },
   "ja": {
     "title": "ラジオ リモコン",
@@ -172,7 +178,8 @@
     "theme_dark": "ダーク",
     "theme_follow_browser": "ブラウザに従う",
     "lang_auto_browser": "自動 (ブラウザ)",
-    "api_docs": "API ドキュメント"
+    "api_docs": "API ドキュメント",
+    "prompt_pairing_code": "ペアリングコードを入力してください:"
   },
   "uk": {
     "title": "Пульт Радіо",
@@ -197,7 +204,8 @@
     "theme_dark": "Темна",
     "theme_follow_browser": "Як у браузері",
     "lang_auto_browser": "Авто (Браузер)",
-    "api_docs": "Документація API"
+    "api_docs": "Документація API",
+    "prompt_pairing_code": "Введіть код сполучення:"
   },
   "el": {
     "title": "Ραδιοφωνικό Χειριστήριο",
@@ -222,7 +230,8 @@
     "theme_dark": "Σκοτεινό",
     "theme_follow_browser": "Ακολουθήστε το πρόγραμμα περιήγησης",
     "lang_auto_browser": "Αυτόματο (Browser)",
-    "api_docs": "Τεκμηρίωση API"
+    "api_docs": "Τεκμηρίωση API",
+    "prompt_pairing_code": "Εισαγάγετε τον κωδικό σύζευξης:"
   },
   "da": {
     "title": "Radio Fjernbetjening",
@@ -247,6 +256,7 @@
     "theme_dark": "Mørkt",
     "theme_follow_browser": "Følg browser",
     "lang_auto_browser": "Auto (Browser)",
-    "api_docs": "API Dokumentation"
+    "api_docs": "API Dokumentation",
+    "prompt_pairing_code": "Indtast parringskode:"
   }
 }
diff --git a/app/src/main/java/com/michatec/radio/Keys.kt b/app/src/main/java/com/michatec/radio/Keys.kt
index 14bc11d..2fc0d9d 100644
--- a/app/src/main/java/com/michatec/radio/Keys.kt
+++ b/app/src/main/java/com/michatec/radio/Keys.kt
@@ -21,6 +21,7 @@ object Keys {
     const val ACTION_THEME_CHANGED: String = "com.michatec.radio.action.THEME_CHANGED"
     const val ACTION_START: String = "com.michatec.radio.action.START"
     const val ACTION_REMOTE_SERVER_ERROR: String = "com.michatec.radio.action.REMOTE_SERVER_ERROR"
+    const val ACTION_REMOTE_AUTH_FAILED: String = "com.michatec.radio.action.REMOTE_AUTH_FAILED"
 
     // intent extras
     const val EXTRA_COLLECTION_MODIFICATION_DATE: String = "COLLECTION_MODIFICATION_DATE"
@@ -99,6 +100,8 @@ object Keys {
     const val PREF_CUSTOM_THEME_INDEX: String = "CUSTOM_THEME_INDEX"
     const val PREF_ARGUMENTS: String = "ARGUMENTS"
     const val PREF_REMOTE_CONTROL_ENABLED: String = "REMOTE_CONTROL_ENABLED"
+    const val PREF_REMOTE_CONTROL_AUTH_ENABLED: String = "REMOTE_CONTROL_AUTH_ENABLED"
+    const val PREF_REMOTE_CONTROL_SECRET_TOKEN: String = "REMOTE_CONTROL_SECRET_TOKEN"
 
     // default const values
     const val DEFAULT_SIZE_OF_METADATA_HISTORY: Int = 25
diff --git a/app/src/main/java/com/michatec/radio/MainActivity.kt b/app/src/main/java/com/michatec/radio/MainActivity.kt
index 3b908f9..4a545b9 100644
--- a/app/src/main/java/com/michatec/radio/MainActivity.kt
+++ b/app/src/main/java/com/michatec/radio/MainActivity.kt
@@ -138,17 +138,21 @@ class MainActivity : AppCompatActivity() {
 
     override fun onStart() {
         super.onStart()
-        // register remote server error receiver
+        // register remote server receivers
+        val filter = IntentFilter().apply {
+            addAction(Keys.ACTION_REMOTE_SERVER_ERROR)
+            addAction(Keys.ACTION_REMOTE_AUTH_FAILED)
+        }
         LocalBroadcastManager.getInstance(this).registerReceiver(
-            remoteServerErrorReceiver,
-            IntentFilter(Keys.ACTION_REMOTE_SERVER_ERROR)
+            remoteServerReceiver,
+            filter
         )
     }
 
     override fun onStop() {
         super.onStop()
-        // unregister remote server error receiver
-        LocalBroadcastManager.getInstance(this).unregisterReceiver(remoteServerErrorReceiver)
+        // unregister remote server receiver
+        LocalBroadcastManager.getInstance(this).unregisterReceiver(remoteServerReceiver)
     }
 
     /* Hides the loading/splash overlay */
@@ -242,21 +246,28 @@ class MainActivity : AppCompatActivity() {
 
 
     /*
-     * Receiver for remote server error
+     * Receiver for remote server events
      */
-    private val remoteServerErrorReceiver: BroadcastReceiver = object : BroadcastReceiver() {
+    private val remoteServerReceiver: BroadcastReceiver = object : BroadcastReceiver() {
         override fun onReceive(context: Context, intent: Intent) {
-            if (intent.action == Keys.ACTION_REMOTE_SERVER_ERROR) {
-                val snackbar = Snackbar.make(
-                    binding.mainRoot,
-                    R.string.error_webserver,
-                    Snackbar.LENGTH_LONG
-                )
-                this@MainActivity.findViewById(R.id.bottom_sheet)?.let {
-                    snackbar.anchorView = it
+            val message = when (intent.action) {
+                Keys.ACTION_REMOTE_SERVER_ERROR -> getString(R.string.error_webserver)
+                Keys.ACTION_REMOTE_AUTH_FAILED -> {
+                    val ip = intent.getStringExtra("REMOTE_IP") ?: "unknown"
+                    getString(R.string.snackbar_remote_auth_failed, ip)
                 }
-                snackbar.show()
+                else -> return
             }
+            
+            val snackbar = Snackbar.make(
+                binding.mainRoot,
+                message,
+                Snackbar.LENGTH_LONG
+            )
+            this@MainActivity.findViewById(R.id.bottom_sheet)?.let {
+                snackbar.anchorView = it
+            }
+            snackbar.show()
         }
     }
     /*
diff --git a/app/src/main/java/com/michatec/radio/PlayerService.kt b/app/src/main/java/com/michatec/radio/PlayerService.kt
index f781342..f333b06 100644
--- a/app/src/main/java/com/michatec/radio/PlayerService.kt
+++ b/app/src/main/java/com/michatec/radio/PlayerService.kt
@@ -92,6 +92,14 @@ class PlayerService : MediaLibraryService(), SharedPreferences.OnSharedPreferenc
                 val intent = Intent(Keys.ACTION_REMOTE_SERVER_ERROR)
                 LocalBroadcastManager.getInstance(this@PlayerService).sendBroadcast(intent)
             }
+
+            onAuthFailed = { ip ->
+                Log.w(TAG, "RemoteControlServer: Multiple failed auth attempts from $ip")
+                val intent = Intent(Keys.ACTION_REMOTE_AUTH_FAILED).apply {
+                    putExtra("REMOTE_IP", ip)
+                }
+                LocalBroadcastManager.getInstance(this@PlayerService).sendBroadcast(intent)
+            }
         }
     }
 
diff --git a/app/src/main/java/com/michatec/radio/SettingsFragment.kt b/app/src/main/java/com/michatec/radio/SettingsFragment.kt
index 42224a7..7feb482 100644
--- a/app/src/main/java/com/michatec/radio/SettingsFragment.kt
+++ b/app/src/main/java/com/michatec/radio/SettingsFragment.kt
@@ -206,8 +206,36 @@ class SettingsFragment : PreferenceFragmentCompat(), YesNoDialog.YesNoDialogList
             getString(R.string.pref_remote_control_summary)
         }
         preferenceRemoteControl.setDefaultValue(PreferencesHelper.loadRemoteControlEnabled())
+        
+        // set up "Remote Control Auth" preference
+        val preferenceRemoteControlAuth = MarqueeSwitchPreference(context)
+        preferenceRemoteControlAuth.title = getString(R.string.pref_remote_control_auth_title)
+        preferenceRemoteControlAuth.setIcon(R.drawable.ic_security_24dp)
+        preferenceRemoteControlAuth.key = Keys.PREF_REMOTE_CONTROL_AUTH_ENABLED
+        preferenceRemoteControlAuth.summary = getString(R.string.pref_remote_control_auth_summary)
+        preferenceRemoteControlAuth.setDefaultValue(PreferencesHelper.loadRemoteControlAuthEnabled())
+        preferenceRemoteControlAuth.isVisible = PreferencesHelper.loadRemoteControlEnabled()
+
+        // set up "Remote Control Secret" preference
+        val preferenceRemoteControlSecret = Preference(context)
+        preferenceRemoteControlSecret.title = getString(R.string.pref_remote_control_secret_title)
+        preferenceRemoteControlSecret.setIcon(R.drawable.ic_info_24dp)
+        preferenceRemoteControlSecret.key = Keys.PREF_REMOTE_CONTROL_SECRET_TOKEN
+        preferenceRemoteControlSecret.summary = PreferencesHelper.loadRemoteControlSecretToken()
+        preferenceRemoteControlSecret.isVisible = PreferencesHelper.loadRemoteControlEnabled() && PreferencesHelper.loadRemoteControlAuthEnabled()
+        preferenceRemoteControlSecret.setOnPreferenceClickListener {
+            // regenerate secret
+            val newSecret = PreferencesHelper.generateSecretToken()
+            PreferencesHelper.saveRemoteControlSecretToken(newSecret)
+            preferenceRemoteControlSecret.summary = newSecret
+            Snackbar.make(requireView(), R.string.toastmessage_secret_regenerated, Snackbar.LENGTH_LONG).show()
+            return@setOnPreferenceClickListener true
+        }
+
         preferenceRemoteControl.setOnPreferenceChangeListener { _, newValue ->
             val enabled = newValue as Boolean
+            preferenceRemoteControlAuth.isVisible = enabled
+            preferenceRemoteControlSecret.isVisible = enabled && preferenceRemoteControlAuth.isChecked
             if (enabled) {
                 val intent = Intent(activity, PlayerService::class.java).apply {
                     action = Keys.ACTION_START
@@ -217,6 +245,11 @@ class SettingsFragment : PreferenceFragmentCompat(), YesNoDialog.YesNoDialogList
             return@setOnPreferenceChangeListener true
         }
 
+        preferenceRemoteControlAuth.setOnPreferenceChangeListener { _, newValue ->
+            preferenceRemoteControlSecret.isVisible = newValue as Boolean
+            return@setOnPreferenceChangeListener true
+        }
+
         // set up "Arguments" preference
         val preferenceArguments = EditTextPreference(context)
         preferenceArguments.title = getString(R.string.pref_arguments_title)
@@ -499,6 +532,9 @@ class SettingsFragment : PreferenceFragmentCompat(), YesNoDialog.YesNoDialogList
         val preferenceCategoryLinks = PreferenceCategory(context)
         preferenceCategoryLinks.title = getString(R.string.pref_links_title)
 
+        val preferenceCategoryRemoteControl = PreferenceCategory(context)
+        preferenceCategoryRemoteControl.title = getString(R.string.pref_remote_control_title)
+
 
         // setup preference screen
         screen.addPreference(preferenceAppVersion)
@@ -509,12 +545,16 @@ class SettingsFragment : PreferenceFragmentCompat(), YesNoDialog.YesNoDialogList
         preferenceCategoryGeneral.addPreference(preferenceLanguageSelection)
         preferenceCategoryGeneral.addPreference(preferenceCustomThemeEnabled)
         preferenceCategoryGeneral.addPreference(preferenceCustomTheme)
-        preferenceCategoryGeneral.addPreference(preferenceRemoteControl)
 
         if (!isAndroidTV && isPermissionGranted(activity as Context, android.Manifest.permission.POST_NOTIFICATIONS)) {
             preferenceCategoryGeneral.addPreference(preferenceTestNotification)
         }
 
+        screen.addPreference(preferenceCategoryRemoteControl)
+        preferenceCategoryRemoteControl.addPreference(preferenceRemoteControl)
+        preferenceCategoryRemoteControl.addPreference(preferenceRemoteControlAuth)
+        preferenceCategoryRemoteControl.addPreference(preferenceRemoteControlSecret)
+
         screen.addPreference(preferenceCategoryAudioEffects)
         preferenceCategoryAudioEffects.addPreference(preferenceBassBoost)
         preferenceCategoryAudioEffects.addPreference(preferenceReverb)
diff --git a/app/src/main/java/com/michatec/radio/helpers/PreferencesHelper.kt b/app/src/main/java/com/michatec/radio/helpers/PreferencesHelper.kt
index 80053a1..71eb0cd 100644
--- a/app/src/main/java/com/michatec/radio/helpers/PreferencesHelper.kt
+++ b/app/src/main/java/com/michatec/radio/helpers/PreferencesHelper.kt
@@ -418,6 +418,33 @@ object PreferencesHelper {
         }
     }
 
+    /* Loads whether remote control authentication is enabled */
+    fun loadRemoteControlAuthEnabled(): Boolean {
+        return sharedPreferences.getBoolean(Keys.PREF_REMOTE_CONTROL_AUTH_ENABLED, false)
+    }
+
+    /* Loads remote control secret token */
+    fun loadRemoteControlSecretToken(): String {
+        var token = sharedPreferences.getString(Keys.PREF_REMOTE_CONTROL_SECRET_TOKEN, "") ?: ""
+        if (token.isEmpty()) {
+            token = generateSecretToken()
+            saveRemoteControlSecretToken(token)
+        }
+        return token
+    }
+
+    /* Saves remote control secret token */
+    fun saveRemoteControlSecretToken(token: String) {
+        sharedPreferences.edit {
+            putString(Keys.PREF_REMOTE_CONTROL_SECRET_TOKEN, token)
+        }
+    }
+
+    /* Generates a random 6-digit secret token */
+    fun generateSecretToken(): String {
+        return (100000..999999).random().toString()
+    }
+
     /* SHA-256 helper */
     private fun String.sha256(): String {
         return try {
diff --git a/app/src/main/java/com/michatec/radio/helpers/RemoteControlServer.kt b/app/src/main/java/com/michatec/radio/helpers/RemoteControlServer.kt
index ef84c86..d008870 100644
--- a/app/src/main/java/com/michatec/radio/helpers/RemoteControlServer.kt
+++ b/app/src/main/java/com/michatec/radio/helpers/RemoteControlServer.kt
@@ -14,10 +14,12 @@ import io.ktor.server.application.*
 import io.ktor.server.engine.*
 import io.ktor.server.netty.*
 import io.ktor.server.plugins.contentnegotiation.*
+import io.ktor.server.request.*
 import io.ktor.server.response.*
 import io.ktor.server.routing.*
 import io.ktor.server.websocket.*
 import io.ktor.websocket.*
+import java.util.concurrent.ConcurrentHashMap
 import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.asSharedFlow
@@ -35,6 +37,7 @@ class RemoteControlServer(private val context: Context) {
     private var serverScope = CoroutineScope(Dispatchers.IO + SupervisorJob())
     private val lifecycleMutex = Mutex()
     private val gson = Gson()
+    private val failedAttemptsMap = ConcurrentHashMap()
     private val _statusUpdates = MutableSharedFlow>(extraBufferCapacity = 1)
     private val statusUpdates = _statusUpdates.asSharedFlow()
 
@@ -130,6 +133,7 @@ class RemoteControlServer(private val context: Context) {
     var onNext: (() -> Unit)? = null
     var onPrev: (() -> Unit)? = null
     var onError: ((String) -> Unit)? = null
+    var onAuthFailed: ((String) -> Unit)? = null
 
     fun setPlayer(player: Player?) {
         this.player?.removeListener(playerListener)
@@ -170,6 +174,42 @@ class RemoteControlServer(private val context: Context) {
                                 maxFrameSize = Long.MAX_VALUE
                                 masking = false
                             }
+                            
+                            intercept(ApplicationCallPipeline.Plugins) {
+                                val authEnabled = PreferencesHelper.loadRemoteControlAuthEnabled()
+                                if (authEnabled) {
+                                    val secret = PreferencesHelper.loadRemoteControlSecretToken()
+                                    val requestPath = call.request.path()
+                                    val isStatic = requestPath == "/" || 
+                                                  requestPath == "/style.css" || 
+                                                  requestPath == "/script.js" || 
+                                                  requestPath == "/favicon.png" || 
+                                                  requestPath == "/translations.json"
+                                    
+                                    if (!isStatic) {
+                                        val providedKey = call.request.headers["X-Remote-Key"] 
+                                                          ?: call.request.queryParameters["token"]
+                                        val remoteHost = call.request.local.remoteHost
+                                        
+                                        if (providedKey != secret) {
+                                            val attempts = (failedAttemptsMap[remoteHost] ?: 0) + 1
+                                            failedAttemptsMap[remoteHost] = attempts
+                                            
+                                            if (attempts >= 10) {
+                                                withContext(Dispatchers.Main) {
+                                                    onAuthFailed?.invoke(remoteHost)
+                                                }
+                                            }
+                                            delay(2000.milliseconds)
+                                            call.respond(HttpStatusCode.Unauthorized, mapOf("error" to "Unauthorized"))
+                                            finish()
+                                        } else {
+                                            failedAttemptsMap.remove(remoteHost)
+                                        }
+                                    }
+                                }
+                            }
+
                             routing {
                                 get("/") {
                                     val content = safeReadAsset("web/index.html")
@@ -248,7 +288,7 @@ class RemoteControlServer(private val context: Context) {
                                     }
                                     try {
                                         for (frame in incoming) {
-                                            // Just consume to keep connection alive
+                                            frame.takeIf { it is Frame.Text } ?: continue
                                         }
                                     } catch (_: Exception) {
                                         Log.d("RemoteControlServer", "WebSocket client disconnected")
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index a2d3b83..8b6b3b3 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -190,6 +190,13 @@
     Fjernbetjening
     Betjen radioen fra din webbrowser
     Betjen radioen fra http://%1$s:8080
+    Sikkerhedsadvarsel: Flere mislykkede fjernloginforsøg detekteret fra %1$s!
+    Fjernbetjening godkendelse
+    Kræv en parringskode for fjernadgang.
+    Parringskode
+    Brug denne kode til webgrænsefladen og API\'en.
+    Gendan parringskode
+    Parringskode gendannet.
     Web fjernbetjeningsserver crashet/stoppede.
     Søg stationer…
     Kun favoritter
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 9022005..c00addf 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -193,6 +193,13 @@
     Fernbedienung
     Steuere das Radio über deinen Webbrowser
     Steuere das Radio über http://%1$s:8080
+    Sicherheitswarnung: Mehrere fehlgeschlagene Fernanmeldeversuche von %1$s erkannt!
+    Fernbedienungs-Authentifizierung
+    Erfordert einen Pairing-Code für den Fernzugriff.
+    Pairing-Code
+    Verwenden Sie diesen Code für das Web-Interface und die API.
+    Pairing-Code neu generieren
+    Pairing-Code neu generiert.
     Web-Fernbedienungsserver abgestürzt/gestoppt.
     Sender suchen…
     Nur Favoriten
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 9e620b1..786128e 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -192,6 +192,13 @@
     Τηλεχειριστήριο
     Ελέγξτε το ραδιόφωνο από το πρόγραμμα περιήγησής σας
     Ελέγξτε το ραδιόφωνο από το http://%1$s:8080
+    Προειδοποίηση ασφαλείας: Ανιχνεύθηκαν πολλαπλές αποτυχημένες προσπάθειες απομακρυσμένης σύνδεσης από %1$s!
+    Έλεγχος ταυτότητας τηλεχειριστηρίου
+    Απαιτείται κωδικός σύζευξης για απομακρυσμένη πρόσβαση.
+    Κωδικός σύζευξης
+    Χρησιμοποιήστε αυτόν τον κωδικό για τη διεπαφή ιστού και το API.
+    Αναγέννηση κωδικού σύζευξης
+    Ο κωδικός σύζευξης αναγεννήθηκε.
     Ο διακομιστής τηλεχειριστηρίου ιστού κατέρρευσε/σταμάτησε.
 
     Αναζήτηση σταθμών
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index fc44dd5..c4d8552 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -190,6 +190,13 @@
     Télécommande
     Contrôlez la radio depuis votre navigateur web
     Contrôlez la radio depuis http://%1$s:8080
+    Avertissement de sécurité : plusieurs tentatives de connexion à distance échouées détectées depuis %1$s !
+    Authentification de la télécommande
+    Nécessite un code de couplage pour l\'accès à distance.
+    Code de couplage
+    Utilisez ce code pour l\'interface web et l\'API.
+    Régénérer le code de couplage
+    Code de couplage régénéré.
     Serveur de télécommande Web planté/arrêté.
 
     Rechercher des stations
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index ce5a2bb..36baf0a 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -191,6 +191,13 @@
     リモコン
     ウェブブラウザからラジオを操作
     http://%1$s:8080 からラジオを操作
+    セキュリティ警告:%1$s からの複数のリモートログイン試行の失敗が検出されました!
+    リモートコントロール認証
+    リモートアクセスのためにペアリングコードを要求します。
+    ペアリングコード
+    WebインターフェースとAPIにはこのコードを使用してください。
+    ペアリングコードを再生成
+    ペアリングコードが再生成されました。
     Webリモートサーバーがクラッシュ/停止しました。
     局を検索…
     お気に入りのみ
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index d454c4a..c1d38f9 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -192,8 +192,15 @@
     Afstandsbediening
     Bedien de radio vanuit je webbrowser
     Bedien de radio via http://%1$s:8080
+    Veiligheidswaarschuwing: Meerdere mislukte inlogpogingen op afstand gedetecteerd van %1$s!
+    Afstandsbediening Authenticatie
+    Vereist een koppelingscode voor toegang op afstand.
+    Koppelingscode
+    Gebruik deze code voor de webinterface en API.
+    Koppelingscode opnieuw genereren
+    Koppelingscode opnieuw gegenereerd.
     De webserver voor de afstandsbediening is gecrasht of gestopt.
-    Zenders zoeken…
+    Zenders zoeken�
     Alleen favorieten
     Geen zenders gevonden.
     Zenders zoeken
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 29f9f7a..dfca59c 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -191,6 +191,13 @@
     Pilot
     Steruj radiem z przeglądarki internetowej
     Steruj radiem przez http://%1$s:8080
+    Ostrzeżenie o bezpieczeństwie: wykryto wiele nieudanych prób zdalnego logowania z %1$s!
+    Uwierzytelnianie zdalnego sterowania
+    Wymagaj kodu parowania dla zdalnego dostępu.
+    Kod parowania
+    Użyj tego kodu dla interfejsu WWW i API.
+    Wygeneruj ponownie kod parowania
+    Kod parowania został wygenerowany ponownie.
     Serwer zdalnego sterowania uległ awarii/zatrzymaniu.
     Szukaj stacji…
     Tylko ulubione
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 84971d1..d1ce67f 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -192,6 +192,13 @@
     Удалённое управление
     Управляйте радио из вашего веб-браузера
     Управляйте радио через http://%1$s:8080
+    Предупреждение системы безопасности: обнаружено несколько неудачных попыток удаленного входа с %1$s!
+    Аутентификация удаленного управления
+    Требовать код сопряжения для удаленного доступа.
+    Код сопряжения
+    Используйте этот код для веб-интерфейса и API.
+    Перегенерировать код сопряжения
+    Код сопряжения перегенерирован.
     Веб-сервер удалённого управления упал/остановлен.
     Поиск станций…
     Только избранное
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 7cb400c..cbbb295 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -192,6 +192,13 @@
     Дистанційне керування
     Керуйте радіо з вашого веб-браузера
     Керуйте радіо через http://%1$s:8080
+    Попередження про безпеку: виявлено кілька невдалих спроб віддаленого входу з %1$s!
+    Автентифікація віддаленого керування
+    Вимагати код сполучення для віддаленого достуπου.
+    Код сполучення
+    Використовуйте цей код для веб-інтерфейсу та API.
+    Перегенерувати код сполучення
+    Код сполучення перегенеровано.
     Веб-сервер дистанційного керування аварійно зупинився/зупинено.
     Пошук станцій…
     Тільки улюблені
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index aff2601..d8eb758 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -228,6 +228,13 @@
     Remote Control
     Control radio from your web browser
     Control radio from http://%1$s:8080
+    Security Warning: Multiple failed remote login attempts detected from %1$s!
+    Remote Control Authentication
+    Require a pairing code for remote access.
+    Pairing Code
+    Use this code for the web interface and API.
+    Regenerate Pairing Code
+    Pairing code regenerated.
     Web Remote server crashed / stopped.
     Search stations…
     Only favorites