From d4167897da33b0b248514c391a197fb3e612359b Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Mon, 13 Oct 2025 18:02:16 +0600 Subject: [PATCH 1/4] Added password language check --- locale/ubl-settings-repomanager.pot | 4 ++++ locale/ubl-settings-repomanager_ru.po | 4 ++++ source/ubl-settings-repomanager-key.c | 8 ++++++++ source/ubl-strings.h | 4 +++- 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/locale/ubl-settings-repomanager.pot b/locale/ubl-settings-repomanager.pot index b458f12..8fd656b 100644 --- a/locale/ubl-settings-repomanager.pot +++ b/locale/ubl-settings-repomanager.pot @@ -582,3 +582,7 @@ msgstr "" #: source/ubl-strings.h:183 msgid "Repository were not added" msgstr "" + +#: source/ubl-strings.h:183 +msgid "Invalid password" +msgstr "" \ No newline at end of file diff --git a/locale/ubl-settings-repomanager_ru.po b/locale/ubl-settings-repomanager_ru.po index f4d5cb0..79ec573 100644 --- a/locale/ubl-settings-repomanager_ru.po +++ b/locale/ubl-settings-repomanager_ru.po @@ -596,3 +596,7 @@ msgstr "Выбранный каталог хранилища находится #: source/ubl-strings.h:183 msgid "Repository were not added" msgstr "Репозиторий не добавлен" + +#: source/ubl-strings.h:183 +msgid "Invalid password" +msgstr "Неверный пароль" \ No newline at end of file diff --git a/source/ubl-settings-repomanager-key.c b/source/ubl-settings-repomanager-key.c index b9510bb..cb349a9 100644 --- a/source/ubl-settings-repomanager-key.c +++ b/source/ubl-settings-repomanager-key.c @@ -47,9 +47,17 @@ void on_key_generate_accept(GtkWidget *self, key_creation_window* window){ const char *password_confirm = gtk_entry_get_text(GTK_ENTRY(window->PasswordConfirmationEntry)); int ex_status=0; if (yon_char_is_empty(password)&&yon_char_is_empty(password_confirm)){ + yon_debug_output("%s\n",yon_generate_key_no_password_command(type,name,email,strength,comment,expire,password)); ex_status = system(yon_debug_output("%s\n",yon_generate_key_no_password_command(type,name,email,strength,comment,expire,password))); } else if (!strcmp(password,password_confirm)){ + for (int i=0;iStatusBox),PASSWORD_INVALID_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE); + yon_ubl_status_highlight_incorrect(window->PasswordEntry); + return; + } + } yon_debug_output("%s\n",yon_generate_key_command(type,name,email,strength,comment,expire,password)); ex_status = system(yon_debug_output("%s\n",yon_generate_key_command(type,name,email,strength,comment,expire,password))); } else { diff --git a/source/ubl-strings.h b/source/ubl-strings.h index d4549b8..f107a44 100644 --- a/source/ubl-strings.h +++ b/source/ubl-strings.h @@ -182,4 +182,6 @@ #define INSIDE_STORAGE_ERROR_LABEL _("Chosen storage directory is inside of another storage") -#define UNADDED_REPO_LABEL _("Repository were not added") \ No newline at end of file +#define UNADDED_REPO_LABEL _("Repository were not added") + +#define PASSWORD_INVALID_LABEL _("Invalid password") \ No newline at end of file -- 2.35.1 From accee41de74381bb67cc4293915751d8d0eab78e Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Thu, 16 Oct 2025 16:30:00 +0600 Subject: [PATCH 2/4] Test fix for key generation --- source/ubl-settings-repomanager-key.c | 14 ++++++-------- source/ubl-settings-repomanager.h | 4 ++-- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/source/ubl-settings-repomanager-key.c b/source/ubl-settings-repomanager-key.c index cb349a9..8d49f38 100644 --- a/source/ubl-settings-repomanager-key.c +++ b/source/ubl-settings-repomanager-key.c @@ -48,8 +48,9 @@ void on_key_generate_accept(GtkWidget *self, key_creation_window* window){ int ex_status=0; if (yon_char_is_empty(password)&&yon_char_is_empty(password_confirm)){ - yon_debug_output("%s\n",yon_generate_key_no_password_command(type,name,email,strength,comment,expire,password)); - ex_status = system(yon_debug_output("%s\n",yon_generate_key_no_password_command(type,name,email,strength,comment,expire,password))); + char *command = yon_generate_key_no_password_command(type,name,email,strength,comment,expire,password); + yon_debug_output("%s\n",command); + yon_terminal_window_launch_shell(GTK_WINDOW(window->Window),(yon_debug_output("%s\n",command)),SUCCESS_LABEL,FAIL_LABEL); } else if (!strcmp(password,password_confirm)){ for (int i=0;iWindow),yon_debug_output("%s\n",command),SUCCESS_LABEL,FAIL_LABEL); } else { yon_ubl_status_box_spawn(GTK_CONTAINER(window->StatusBox),PASSWORD_INCORRECT_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE); yon_ubl_status_highlight_incorrect(window->PasswordConfirmationEntry); yon_ubl_status_highlight_incorrect(window->PasswordEntry); return; } - if (!ex_status) - yon_ubl_status_box_render(KEY_CREATION_SUCCESS_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE); - else - yon_ubl_status_box_render(KEY_CREATION_FAILURE_LABEL,BACKGROUND_IMAGE_FAIL_TYPE); gtk_widget_destroy(window->Window); yon_sign_list_update(); } diff --git a/source/ubl-settings-repomanager.h b/source/ubl-settings-repomanager.h index f3f92e2..6f0eb25 100644 --- a/source/ubl-settings-repomanager.h +++ b/source/ubl-settings-repomanager.h @@ -126,7 +126,7 @@ Expire-Date: ",!yon_char_is_empty(expire)?expire:"0","\n\ Passphrase: ",password,"\n\ %commit\n\ %echo done\n\ -EOF",NULL) +EOF\n\n",NULL) #define yon_generate_key_no_password_command(type,name,email,strength,comment,expire,password) yon_char_unite("gpg --batch --gen-key < Date: Thu, 16 Oct 2025 16:31:12 +0600 Subject: [PATCH 3/4] Localisation fix --- source/ubl-settings-repomanager-key.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/ubl-settings-repomanager-key.c b/source/ubl-settings-repomanager-key.c index 8d49f38..dc0eba8 100644 --- a/source/ubl-settings-repomanager-key.c +++ b/source/ubl-settings-repomanager-key.c @@ -50,7 +50,7 @@ void on_key_generate_accept(GtkWidget *self, key_creation_window* window){ char *command = yon_generate_key_no_password_command(type,name,email,strength,comment,expire,password); yon_debug_output("%s\n",command); - yon_terminal_window_launch_shell(GTK_WINDOW(window->Window),(yon_debug_output("%s\n",command)),SUCCESS_LABEL,FAIL_LABEL); + yon_terminal_window_launch_shell(GTK_WINDOW(window->Window),(yon_debug_output("%s\n",command)),yon_char_get_localised_from_lib(SUCCESS_LABEL),yon_char_get_localised_from_lib(FAIL_LABEL)); } else if (!strcmp(password,password_confirm)){ for (int i=0;iWindow),yon_debug_output("%s\n",command),SUCCESS_LABEL,FAIL_LABEL); + yon_terminal_window_launch_shell(GTK_WINDOW(window->Window),yon_debug_output("%s\n",command),yon_char_get_localised_from_lib(SUCCESS_LABEL),yon_char_get_localised_from_lib(FAIL_LABEL)); } else { yon_ubl_status_box_spawn(GTK_CONTAINER(window->StatusBox),PASSWORD_INCORRECT_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE); yon_ubl_status_highlight_incorrect(window->PasswordConfirmationEntry); -- 2.35.1 From f55762b41158269a5ec5700af0344d90d0946af7 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Fri, 17 Oct 2025 10:48:25 +0600 Subject: [PATCH 4/4] Fixed key generation --- source/ubl-settings-repomanager.h | 12 ++++++------ ubl-settings-repomanager-key.glade | 2 ++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/source/ubl-settings-repomanager.h b/source/ubl-settings-repomanager.h index 6f0eb25..fb6743f 100644 --- a/source/ubl-settings-repomanager.h +++ b/source/ubl-settings-repomanager.h @@ -119,11 +119,11 @@ Key-Type: ",type,"\n\ Key-Length: 1024\n\ Subkey-Type: ELG-E\n\ Subkey-Length: ",strength,"\n\ -Name-Real: ",name,"\n",\ -!yon_char_is_empty(comment)?"Name-Comment: ":"",!yon_char_is_empty(comment)?comment:"",!yon_char_is_empty(comment)?"\n":""\ -"Name-Email: ",email,"\n\ +Name-Real: '",name,"'\n",\ +!yon_char_is_empty(comment)?"Name-Comment: ":"",!yon_char_is_empty(comment)?comment:"",!yon_char_is_empty(comment)?"\n":"","\ +Name-Email: '",email,"'\n\ Expire-Date: ",!yon_char_is_empty(expire)?expire:"0","\n\ -Passphrase: ",password,"\n\ +Passphrase: '",password,"'\n\ %commit\n\ %echo done\n\ EOF\n\n",NULL) @@ -135,8 +135,8 @@ Key-Length: 1024\n\ Subkey-Type: ELG-E\n\ Subkey-Length: ",strength,"\n\ Name-Real: ",name,"\n",\ -!yon_char_is_empty(comment)?"Name-Comment: ":"",!yon_char_is_empty(comment)?comment:"",!yon_char_is_empty(comment)?"\n":""\ -"Name-Email: ",email,"\n\ +!yon_char_is_empty(comment)?"Name-Comment: ":"",!yon_char_is_empty(comment)?comment:"",!yon_char_is_empty(comment)?"\n":"","\ +Name-Email: '",email,"'\n\ Expire-Date: ",!yon_char_is_empty(expire)?expire:"0","\n\ %no-protection\n\ %commit\n\ diff --git a/ubl-settings-repomanager-key.glade b/ubl-settings-repomanager-key.glade index 7801c82..cd15e73 100644 --- a/ubl-settings-repomanager-key.glade +++ b/ubl-settings-repomanager-key.glade @@ -345,6 +345,7 @@ True True + 128 False * @@ -383,6 +384,7 @@ True True + 128 False * -- 2.35.1