Implemented connect to localhost with ssh-tunneling warning dialog

ComicSAS · ComicSAS · commit bb42f95ad295 · 2024-07-27T16:53:19.000+03:00
diff --git a/core/validation/src/main/java/com/shifthackz/aisdv1/core/validation/url/UrlValidatorImpl.kt b/core/validation/src/main/java/com/shifthackz/aisdv1/core/validation/url/UrlValidatorImpl.kt
@@ -19,10 +19,6 @@ internal class UrlValidatorImpl : UrlValidator {
             isValid = false,
             validationError = UrlValidator.Error.BadScheme,
         )
-        input.contains(LOCALHOST_IPV4) -> ValidationResult(
-            isValid = false,
-            validationError = UrlValidator.Error.Localhost,
-        )
         !URLUtil.isValidUrl(input) -> ValidationResult(
             isValid = false,
             validationError = UrlValidator.Error.Invalid,
@@ -31,6 +27,10 @@ internal class UrlValidatorImpl : UrlValidator {
             isValid = false,
             validationError = UrlValidator.Error.Invalid,
         )
+        input.contains(LOCALHOST_IPV4) -> ValidationResult(
+            isValid = false,
+            validationError = UrlValidator.Error.Localhost,
+        )
         else -> ValidationResult(isValid = true)
     }
 
diff --git a/presentation/src/main/java/com/shifthackz/aisdv1/presentation/modal/ModalRenderer.kt b/presentation/src/main/java/com/shifthackz/aisdv1/presentation/modal/ModalRenderer.kt
@@ -192,7 +192,7 @@ fun ModalRenderer(
             onDismissRequest = dismiss,
         )
 
-        Modal.ExportInProgress ->  ProgressDialog(
+        Modal.ExportInProgress -> ProgressDialog(
             titleResId = R.string.exporting_progress_title,
             subTitleResId = R.string.exporting_progress_sub_title,
             canDismiss = false,
@@ -242,5 +242,14 @@ fun ModalRenderer(
             onDismissRequest = dismiss,
             onResult = { processIntent(ImageToImageIntent.UpdateImage(it)) }
         )
+
+        Modal.ConnectLocalHost -> DecisionInteractiveDialog(
+            title = R.string.interaction_warning_title.asUiText(),
+            text = R.string.interaction_warning_localhost_sub_title.asUiText(),
+            confirmActionResId = R.string.yes_i_did,
+            dismissActionResId = R.string.cancel,
+            onConfirmAction = { processIntent(ServerSetupIntent.ConnectToLocalHost) },
+            onDismissRequest = dismiss,
+        )
     }
 }
diff --git a/presentation/src/main/java/com/shifthackz/aisdv1/presentation/model/Modal.kt b/presentation/src/main/java/com/shifthackz/aisdv1/presentation/model/Modal.kt
@@ -22,6 +22,8 @@ sealed interface Modal {
 
     data object ExportInProgress : Modal
 
+    data object ConnectLocalHost : Modal
+
 
     @Immutable
     data class SelectSdModel(val models: List<String>, val selected: String) : Modal
@@ -64,13 +66,13 @@ sealed interface Modal {
     sealed interface Image : Modal {
 
         @Immutable
-        data class Single(val result: AiGenerationResult, val autoSaveEnabled: Boolean): Image
+        data class Single(val result: AiGenerationResult, val autoSaveEnabled: Boolean) : Image
 
         @Immutable
-        data class Batch(val results: List<AiGenerationResult>, val autoSaveEnabled: Boolean): Image
+        data class Batch(val results: List<AiGenerationResult>, val autoSaveEnabled: Boolean) : Image
 
         @Immutable
-        data class Crop(val bitmap: Bitmap): Image
+        data class Crop(val bitmap: Bitmap) : Image
 
         companion object {
             fun create(list: List<AiGenerationResult>, autoSaveEnabled: Boolean): Image =
diff --git a/presentation/src/main/java/com/shifthackz/aisdv1/presentation/screen/setup/ServerSetupIntent.kt b/presentation/src/main/java/com/shifthackz/aisdv1/presentation/screen/setup/ServerSetupIntent.kt
@@ -46,6 +46,8 @@ sealed interface ServerSetupIntent : MviIntent {
 
     data object LaunchManageStoragePermission : ServerSetupIntent
 
+    data object ConnectToLocalHost : ServerSetupIntent
+
     sealed class LaunchUrl : ServerSetupIntent, KoinComponent {
 
         protected val linksProvider: LinksProvider by inject()
diff --git a/presentation/src/main/java/com/shifthackz/aisdv1/presentation/screen/setup/ServerSetupViewModel.kt b/presentation/src/main/java/com/shifthackz/aisdv1/presentation/screen/setup/ServerSetupViewModel.kt
@@ -200,6 +200,26 @@ class ServerSetupViewModel(
         is ServerSetupIntent.UpdateStabilityAiApiKey -> updateState {
             it.copy(stabilityAiApiKey = intent.key)
         }
+
+        ServerSetupIntent.ConnectToLocalHost -> {
+            connectToLocalHostWithSSH()
+        }
+    }
+
+    private fun connectToLocalHostWithSSH() {
+        emitEffect(ServerSetupEffect.HideKeyboard)
+        !connectToAutomaticInstance()
+            .doOnSubscribe { setScreenModal(Modal.Communicating(canCancel = false)) }
+            .subscribeOnMainThread(schedulersProvider)
+            .subscribeBy(::errorLog) { result ->
+                result.fold(
+                    onSuccess = { onSetupComplete() },
+                    onFailure = { t ->
+                        val message = t.localizedMessage ?: "Bad key"
+                        setScreenModal(Modal.Error(message.asUiText()))
+                    }
+                )
+            }
     }
 
     private fun connectToServer() {
@@ -243,6 +263,9 @@ class ServerSetupViewModel(
                         )
                         isValid = isValid && loginValidation.isValid && passwordValidation.isValid
                     }
+                    if (serverUrlValidation.validationError is UrlValidator.Error.Localhost) {
+                        newState = it.copy(screenModal = Modal.ConnectLocalHost)
+                    }
                     newState
                 }
                 isValid
diff --git a/presentation/src/main/java/com/shifthackz/aisdv1/presentation/screen/setup/mappers/ServerSetupValidationUrlMapper.kt b/presentation/src/main/java/com/shifthackz/aisdv1/presentation/screen/setup/mappers/ServerSetupValidationUrlMapper.kt
@@ -12,6 +12,6 @@ fun ValidationResult<UrlValidator.Error>.mapToUi(): UiText? {
         UrlValidator.Error.BadScheme -> R.string.error_invalid_scheme
         UrlValidator.Error.Empty -> R.string.error_empty_url
         UrlValidator.Error.Invalid -> R.string.error_invalid_url
-        UrlValidator.Error.Localhost -> R.string.error_localhost_url
-    }.asUiText()
+        UrlValidator.Error.Localhost -> null
+    }?.asUiText()
 }
diff --git a/presentation/src/main/res/values-ru/strings.xml b/presentation/src/main/res/values-ru/strings.xml
@@ -5,6 +5,7 @@
     <string name="locale">ru</string>
     <string name="ok">OK</string>
     <string name="yes">Да</string>
+    <string name="yes_i_did">Да, я это сделал</string>
     <string name="no">Нет</string>
     <string name="cancel">Отмена</string>
     <string name="retry">Повторить</string>
@@ -208,6 +209,9 @@
     <string name="interaction_export_sub_title">Эта функция экспортирует все изображения галереи в архив *.zip. Этот процесс может длиться долго, если у вас много изображений. Хотите продолжить?</string>
     <string name="interaction_cache_sub_title">Это приведет к сбросу настроек программы и удалению всех созданных изображений. Вы хотите продолжить?</string>
 
+    <string name="interaction_warning_title">Предупреждение</string>
+    <string name="interaction_warning_localhost_sub_title">Если вы хотите подключиться к вашему локальному серверу (127.0.0.1), убедитесь, что у вас включено SSH-туннелирование в целях безопасности!</string>
+
     <string name="interaction_delete_generation_title">Удалить изображение</string>
     <string name="interaction_delete_generation_sub_title">Вы уверены, что хотите окончательно удалить это изображение?</string>
 
diff --git a/presentation/src/main/res/values-tr/strings.xml b/presentation/src/main/res/values-tr/strings.xml
@@ -5,6 +5,7 @@
     <string name="locale">tr</string>
     <string name="ok">Tamam</string>
     <string name="yes">Evet</string>
+    <string name="yes_i_did">Evet, yaptım</string>
     <string name="no">Hayır</string>
     <string name="cancel">İptal</string>
     <string name="retry">yeniden dene</string>
@@ -95,7 +96,7 @@
     <string name="hint_server_setup_title">Lütfen Stable Diffusion WebUI(AUTOMATIC1111) URL adresinizi yazın.</string>
     <string name="hint_valid_urls">Bazı sunucu örnekleri:\n• http://192.168.0.2:7860\n• http://alanadiniz.com:7860\n• https://alanadiniz.com</string>
     <string name="hint_demo_mode">This mode allows you to test the application behavior, even if you don\'t have Stable Diffusion WebUI server.\n\nIn demo mode app ignores user prompt, does not use AI server, and returns some mock images.</string>
-    <string name="hint_args_warning" tools:ignore="TypographyDashes">Before connecting ensure that:\n• you are running AUTOMATIC1111 WebUI with flags --api --listen\n• your firewall is not blocking 7860 port\n• phone is on the same WiFi with your PC</string>
+    <string name="hint_args_warning" tools:ignore="TypographyDashes,Typos">Before connecting ensure that:\n• you are running AUTOMATIC1111 WebUI with flags --api --listen\n• your firewall is not blocking 7860 port\n• phone is on the same WiFi with your PC</string>
 
     <string name="hint_server_horde_title">Horde AI bulutuna bağlanın</string>
     <string name="hint_server_horde_sub_title">Horde AI, Görüntü oluşturma çalışanları ve metin oluşturma çalışanlarından oluşan kitle kaynaklı dağıtılmış bir kümedir.</string>
@@ -128,7 +129,7 @@
     <string name="home_tab_settings">Ayarlar</string>
 
     <string name="gallery_tab_image">Resim</string>
-    <string name="gallery_tab_original">Orjinal</string>
+    <string name="gallery_tab_original">Orijinal</string>
     <string name="gallery_tab_info">Bilgi</string>
 
     <string name="title_text_to_image">Yazıdan Resime</string>
@@ -208,6 +209,9 @@
     <string name="interaction_export_sub_title">Bu işlem bütün galerideki resimleri tek bir .zip arşivi dosyası olarak dışa aktaracaktır. Galerinizin boyutuna göre bu işlem uzun bir zaman alabailir. Devam etmek istiyor musunuz?</string>
     <string name="interaction_cache_sub_title">Bu işlem bütün uygulama ayarlarını ve oluşturulan resimleri silecektir. Devam etmek istiyor musunuz?</string>
 
+    <string name="interaction_warning_title">Uyarı</string>
+    <string name="interaction_warning_localhost_sub_title">Eğer localhost (127.0.0.1) sunucunuza bağlanmak istiyorsanız, lütfen güvenlik için ssh tünellemesinin etkinleştirildiğinden emin olun!</string>
+
     <string name="interaction_delete_generation_title">Resmi sil</string>
     <string name="interaction_delete_generation_sub_title">Kalıcı olarak bu resmi silmek istediğinize emin misiniz?</string>
 
diff --git a/presentation/src/main/res/values-uk/strings.xml b/presentation/src/main/res/values-uk/strings.xml
@@ -5,6 +5,7 @@
     <string name="locale">uk</string>
     <string name="ok">OK</string>
     <string name="yes">Так</string>
+    <string name="yes_i_did">Так, я зробив</string>
     <string name="no">Ні</string>
     <string name="cancel">Скасувати</string>
     <string name="retry">Повторити</string>
@@ -208,6 +209,9 @@
     <string name="interaction_export_sub_title">Ця функція експортує всі зображення галереї у архів *.zip. Цей процес може тривати довго, якщо у вас багато зображень. Бажаєте продовжити?</string>
     <string name="interaction_cache_sub_title">Це призведе до скидання налаштувань програми та видалення всіх створених зображень. Ви бажаєте продовжити?</string>
 
+    <string name="interaction_warning_title">Попередження</string>
+    <string name="interaction_warning_localhost_sub_title">Якщо ви хочете підключитися до свого сервера localhost (127.0.0.1), будь ласка, переконайтеся, що у вас увімкнено тунелювання ssh з міркувань безпеки!</string>
+
     <string name="interaction_delete_generation_title">Видалити зображення</string>
     <string name="interaction_delete_generation_sub_title">Ви впевнені, що хочете остаточно видалити це зображення?</string>
 
diff --git a/presentation/src/main/res/values-zh/strings.xml b/presentation/src/main/res/values-zh/strings.xml
@@ -10,6 +10,7 @@
     <string name="locale">zh</string>
     <string name="ok">确定</string>
     <string name="yes">是</string>
+    <string name="yes_i_did">是的，我做到了</string>
     <string name="no">否</string>
     <string name="cancel">取消</string>
     <string name="retry">重试</string>
@@ -255,6 +256,10 @@
     <string name="interaction_export_sub_title">这将把所有图库图像导出为*.zip压缩包。此过程可能很长，如果您有很多图片，您想继续吗？</string>
     <string name="interaction_cache_sub_title">这将重置应用设置并删除所有生成的图像。您想继续吗？</string>
 
+    <!-- 警告互动 -->
+    <string name="interaction_warning_title">警告性的</string>
+    <string name="interaction_warning_localhost_sub_title">如果您想连接到本地主机（127.0.0.1）服务器，请确保您已启用 ssh 隧道以确保安全!</string>
+
     <!-- 删除图像提示 -->
     <string name="interaction_delete_generation_title">删除图像</string>
     <string name="interaction_delete_generation_sub_title">您确定要永久删除此图像吗？</string>
diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml
@@ -9,6 +9,7 @@
     <string name="locale">en</string>
     <string name="ok">OK</string>
     <string name="yes">Yes</string>
+    <string name="yes_i_did">Yes, I did</string>
     <string name="no">No</string>
     <string name="cancel">Cancel</string>
     <string name="retry">Retry</string>
@@ -111,7 +112,7 @@
     <string name="hint_server_setup_title">Provide your Stable Diffusion WebUI URL</string>
     <string name="hint_valid_urls">Here are the examples of server URLs:\n• http://192.168.0.2:7860\n• http://yourdomain.com:7860\n• https://yourdomain.com</string>
     <string name="hint_demo_mode">This mode allows you to test the application behavior, even if you don\'t have Stable Diffusion WebUI server.\n\nIn demo mode app ignores user prompt, does not use AI server, and returns some mock images.</string>
-    <string name="hint_args_warning" tools:ignore="TypographyDashes">Before connecting ensure that:\n• you are running AUTOMATIC1111 WebUI with flags --api --listen\n• your firewall is not blocking 7860 port\n• phone is on the same WiFi with your PC</string>
+    <string name="hint_args_warning" tools:ignore="TypographyDashes,Typos">Before connecting ensure that:\n• you are running AUTOMATIC1111 WebUI with flags --api --listen\n• your firewall is not blocking 7860 port\n• phone is on the same WiFi with your PC</string>
 
     <string name="hint_server_horde_title">Connect to Horde AI cloud</string>
     <string name="hint_server_horde_sub_title">Horde AI is a crowdsourced distributed cluster of Image generation workers and text generation workers.</string>
@@ -227,6 +228,9 @@
     <string name="interaction_export_sub_title">This will export all the gallery images as *.zip archive. This process may be long if you have many images, would you like to proceed?</string>
     <string name="interaction_cache_sub_title">This will reset app settings and delete all the generated images. Do you want to proceed?</string>
 
+    <string name="interaction_warning_title">Warning</string>
+    <string name="interaction_warning_localhost_sub_title">If you want to connect to your localhost (127.0.0.1) server, please make sure that you have ssh tunneling enabled for security!</string>
+
     <string name="interaction_delete_generation_title">Delete image</string>
     <string name="interaction_delete_generation_sub_title">Are you sure you want to permanently delete this image?</string>
 

Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@ fun ModalRenderer(`
`192`	`192`	`onDismissRequest = dismiss,`
`193`	`193`	`)`
`194`	`194`
`195`		`- Modal.ExportInProgress -> ProgressDialog(`
	`195`	`+ Modal.ExportInProgress -> ProgressDialog(`
`196`	`196`	`titleResId = R.string.exporting_progress_title,`
`197`	`197`	`subTitleResId = R.string.exporting_progress_sub_title,`
`198`	`198`	`canDismiss = false,`
`@@ -242,5 +242,14 @@ fun ModalRenderer(`
`242`	`242`	`onDismissRequest = dismiss,`
`243`	`243`	`onResult = { processIntent(ImageToImageIntent.UpdateImage(it)) }`
`244`	`244`	`)`
	`245`	`+`
	`246`	`+ Modal.ConnectLocalHost -> DecisionInteractiveDialog(`
	`247`	`+ title = R.string.interaction_warning_title.asUiText(),`
	`248`	`+ text = R.string.interaction_warning_localhost_sub_title.asUiText(),`
	`249`	`+ confirmActionResId = R.string.yes_i_did,`
	`250`	`+ dismissActionResId = R.string.cancel,`
	`251`	`+ onConfirmAction = { processIntent(ServerSetupIntent.ConnectToLocalHost) },`
	`252`	`+ onDismissRequest = dismiss,`
	`253`	`+ )`
`245`	`254`	`}`
`246`	`255`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,6 @@ fun ValidationResult<UrlValidator.Error>.mapToUi(): UiText? {`
`12`	`12`	`UrlValidator.Error.BadScheme -> R.string.error_invalid_scheme`
`13`	`13`	`UrlValidator.Error.Empty -> R.string.error_empty_url`
`14`	`14`	`UrlValidator.Error.Invalid -> R.string.error_invalid_url`
`15`		`- UrlValidator.Error.Localhost -> R.string.error_localhost_url`
`16`		`- }.asUiText()`
	`15`	`+ UrlValidator.Error.Localhost -> null`
	`16`	`+ }?.asUiText()`
`17`	`17`	`}`