Applications
/
ubl-settings-update
8
0
Fork 1
Code Issues 10 Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'master' (#108) from YanTheKaller/ubl-settings-update:master into master

Browse Source 
Reviewed-on: #108
pull/109/head^2^2 v2.13
Dmitry Razumov 11 months ago
parent bf39d0ebaf ebeab16248
commit 6cbbe225f4
3 changed files with 100 additions and 46 deletions
Show Stats Download Patch File Download Diff File

80
source/ubl-settings-update.c
Unescape View File

@ -500,16 +500,16 @@ void yon_interface_update(main_window *widgets){
gtk_list_store_set(widgets->WebPublicationList,&iter,5,parsed[3],-1); gtk_list_store_set(widgets->WebPublicationList,&iter,5,parsed[3],-1);
} }
if (cur_size>4&&!yon_char_is_empty(parsed[4])){ if (cur_size>4&&!yon_char_is_empty(parsed[4])){
if (!strcmp(parsed[5],"sha256")||!strcmp(parsed[5],"sha512")){ if (!strcmp(parsed[4],"sha256")||!strcmp(parsed[4],"sha512")){
gtk_list_store_set(widgets->WebPublicationList,&iter,7,"******",-1); gtk_list_store_set(widgets->WebPublicationList,&iter,7,"******",-1);
gtk_list_store_set(widgets->WebPublicationList,&iter,6,parsed[5],-1); gtk_list_store_set(widgets->WebPublicationList,&iter,6,parsed[4],-1);
} else { } else {
if (strlen(parsed[4])==128||strlen(parsed[4])==64) if (strlen(parsed[4])==128||strlen(parsed[4])==64)
gtk_list_store_set(widgets->WebPublicationList,&iter,7,parsed[4],-1); gtk_list_store_set(widgets->WebPublicationList,&iter,7,parsed[5],-1);
else else
gtk_list_store_set(widgets->WebPublicationList,&iter,7,"******",-1); gtk_list_store_set(widgets->WebPublicationList,&iter,7,"******",-1);
if (cur_size>5&&!yon_char_is_empty(parsed[5])){ if (cur_size>5&&!yon_char_is_empty(parsed[5])){
gtk_list_store_set(widgets->WebPublicationList,&iter,6,parsed[5],-1); gtk_list_store_set(widgets->WebPublicationList,&iter,6,parsed[4],-1);
} }
} }
} }
@ -751,6 +751,8 @@ void yon_hash_entry_sensitiveness_update(GtkWidget *, password_window *dialog){
void on_password_open(GtkWidget *, web_publication_add_window *window){ void on_password_open(GtkWidget *, web_publication_add_window *window){
password_window *dialog = yon_password_window_new(); password_window *dialog = yon_password_window_new();
g_signal_connect(G_OBJECT(dialog->NoEncriptionCheck),"toggled",G_CALLBACK(yon_hash_entry_sensitiveness_update),dialog);
g_signal_connect(G_OBJECT(dialog->EncryptionCombo),"changed",G_CALLBACK(yon_hash_entry_sensitiveness_update),dialog);
yon_gtk_entry_set_password_visibility_icon(GTK_ENTRY(dialog->PasswordEntry)); yon_gtk_entry_set_password_visibility_icon(GTK_ENTRY(dialog->PasswordEntry));
yon_gtk_entry_set_password_visibility_icon(GTK_ENTRY(dialog->PasswordHashEntry)); yon_gtk_entry_set_password_visibility_icon(GTK_ENTRY(dialog->PasswordHashEntry));
yon_gtk_entry_set_password_visibility_icon(GTK_ENTRY(dialog->RepeatPasswordEntry)); yon_gtk_entry_set_password_visibility_icon(GTK_ENTRY(dialog->RepeatPasswordEntry));
@ -772,8 +774,6 @@ void on_password_open(GtkWidget *, web_publication_add_window *window){
yon_dictionary_add_or_create_if_exists_with_data(dict,"window",dialog); yon_dictionary_add_or_create_if_exists_with_data(dict,"window",dialog);
yon_dictionary_add_or_create_if_exists_with_data(dict,"target",window->UserPasswordEntry); yon_dictionary_add_or_create_if_exists_with_data(dict,"target",window->UserPasswordEntry);
g_signal_connect(G_OBJECT(dialog->AcceptButton),"clicked",G_CALLBACK(on_password_accept),dict); g_signal_connect(G_OBJECT(dialog->AcceptButton),"clicked",G_CALLBACK(on_password_accept),dict);
g_signal_connect(G_OBJECT(dialog->NoEncriptionCheck),"toggled",G_CALLBACK(yon_hash_entry_sensitiveness_update),dialog);
g_signal_connect(G_OBJECT(dialog->EncryptionCombo),"changed",G_CALLBACK(yon_hash_entry_sensitiveness_update),dialog);
g_signal_connect(G_OBJECT(dialog->EncryptionCombo),"changed",G_CALLBACK(on_password_encryption_changed),dialog); g_signal_connect(G_OBJECT(dialog->EncryptionCombo),"changed",G_CALLBACK(on_password_encryption_changed),dialog);
yon_gtk_window_setup(GTK_WINDOW(dialog->Window),GTK_WINDOW(window->Window),PASSWORD_INPUT_LABEL,icon_path,"password_window"); yon_gtk_window_setup(GTK_WINDOW(dialog->Window),GTK_WINDOW(window->Window),PASSWORD_INPUT_LABEL,icon_path,"password_window");
} }
@ -1237,11 +1237,12 @@ void on_web_publish_accept(GtkWidget *, dictionary *dict){
yon_ubl_status_highlight_incorrect(window->UserPasswordEntry); yon_ubl_status_highlight_incorrect(window->UserPasswordEntry);
return; return;
} }
if (username_check&&encryption&&!yon_char_is_empty(encryption)&&(strlen(user_password)!=128&&strlen(user_password)!=64)){ // if (username_check&&encryption&&!yon_char_is_empty(encryption)&&(strlen(user_password)!=128&&strlen(user_password)!=64)){
yon_ubl_status_box_spawn(GTK_CONTAINER(window->StatusBox),PASSWORD_RESTRICTED_SYMBOL_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE);
yon_ubl_status_highlight_incorrect(window->UserPasswordEntry); // yon_ubl_status_box_spawn(GTK_CONTAINER(window->StatusBox),PASSWORD_RESTRICTED_SYMBOL_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE);
return; // yon_ubl_status_highlight_incorrect(window->UserPasswordEntry);
} // return;
// }
char *name = (char*)gtk_entry_get_text(GTK_ENTRY(window->PathEntry)); char *name = (char*)gtk_entry_get_text(GTK_ENTRY(window->PathEntry));
char *full_name = ""; char *full_name = "";
@ -1271,8 +1272,8 @@ void on_web_publish_accept(GtkWidget *, dictionary *dict){
enable_browser?"listing":"",":", enable_browser?"listing":"",":",
port_enabled?port:"",":", port_enabled?port:"",":",
username_check?username:"",":", username_check?username:"",":",
username_check?!yon_char_is_empty(user_password)?user_password:"":"",":", username_check?yon_char_is_empty(encryption)?user_password:encryption:"",":",
username_check?yon_char_is_empty(encryption)?"":encryption:"", username_check?!yon_char_is_empty(user_password)&&!yon_char_is_empty(encryption)?user_password:"":"",
NULL); NULL);
if (!yon_char_is_empty(window->name)&&strcmp(final_name,window->name)){ if (!yon_char_is_empty(window->name)&&strcmp(final_name,window->name)){
yon_config_remove_by_key(REPOPUBLIC_WEB_full(window->name)); yon_config_remove_by_key(REPOPUBLIC_WEB_full(window->name));
@ -1425,11 +1426,26 @@ char *yon_password_hash_get(password_window *window){
const char *encription = gtk_combo_box_get_active_id(GTK_COMBO_BOX(window->EncryptionCombo)); const char *encription = gtk_combo_box_get_active_id(GTK_COMBO_BOX(window->EncryptionCombo));
const char *hash = gtk_entry_get_text(GTK_ENTRY(window->PasswordHashEntry)); const char *hash = gtk_entry_get_text(GTK_ENTRY(window->PasswordHashEntry));
if (!yon_char_is_empty(hash)){ if (!yon_char_is_empty(hash)){
if (strcmp(hash,window->old_password)&&strlen(hash)!=128&&strlen(hash)!=64){ // if (!yon_char_is_empty(window->old_password)&&strcmp(hash,window->old_password)){
switch(encription_active){
case 1:{
if (strlen(hash)!=128){
yon_ubl_status_box_spawn(GTK_CONTAINER(window->StatusBox),INCORRECT_HASH_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE); yon_ubl_status_box_spawn(GTK_CONTAINER(window->StatusBox),INCORRECT_HASH_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE);
yon_ubl_status_highlight_incorrect(window->PasswordHashEntry); yon_ubl_status_highlight_incorrect(window->PasswordHashEntry);
return NULL; return NULL;
} }
}
break;
case 2:{
if (strlen(hash)!=64){
yon_ubl_status_box_spawn(GTK_CONTAINER(window->StatusBox),INCORRECT_HASH_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE);
yon_ubl_status_highlight_incorrect(window->PasswordHashEntry);
return NULL;
}
}
break;
}
// }
char *final = yon_char_unite(encription,"|",hash,NULL); char *final = yon_char_unite(encription,"|",hash,NULL);
return final; return final;
} else { } else {
@ -1440,6 +1456,11 @@ char *yon_password_hash_get(password_window *window){
yon_ubl_status_highlight_incorrect(window->PasswordEntry); yon_ubl_status_highlight_incorrect(window->PasswordEntry);
return NULL; return NULL;
} }
if (yon_char_is_empty(password_repeat)){
yon_ubl_status_box_spawn(GTK_CONTAINER(window->StatusBox),EMPTY_IMPORTANT_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE);
yon_ubl_status_highlight_incorrect(window->RepeatPasswordEntry);
return NULL;
}
if (strcmp(password,password_repeat)){ if (strcmp(password,password_repeat)){
yon_ubl_status_box_spawn(GTK_CONTAINER(window->StatusBox),PASSWORD_MISMATCH_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE); yon_ubl_status_box_spawn(GTK_CONTAINER(window->StatusBox),PASSWORD_MISMATCH_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE);
yon_ubl_status_highlight_incorrect(window->PasswordEntry); yon_ubl_status_highlight_incorrect(window->PasswordEntry);
@ -1595,6 +1616,29 @@ void on_file_chooser_open(GtkWidget *, GtkEntry *target){
gtk_widget_destroy(dialog); gtk_widget_destroy(dialog);
} }
void on_password_hash_sensitiveness(GtkWidget *,password_window *window){
const char *password = gtk_entry_get_text(GTK_ENTRY(window->PasswordEntry));
const char *repeat_password = gtk_entry_get_text(GTK_ENTRY(window->RepeatPasswordEntry));
const char *hash = gtk_entry_get_text(GTK_ENTRY(window->PasswordHashEntry));
if (!yon_char_is_empty(password)||!yon_char_is_empty(repeat_password)){
gtk_widget_set_sensitive(window->HashBox,0);
gtk_widget_set_sensitive(window->PasswordBox,1);
} else if (yon_char_is_empty(password)&&yon_char_is_empty(repeat_password)&&
gtk_combo_box_get_active(GTK_COMBO_BOX(window->EncryptionCombo))>0&&
yon_char_is_empty(hash)){
gtk_widget_set_sensitive(window->HashBox,1);
gtk_widget_set_sensitive(window->PasswordBox,1);
gtk_widget_set_sensitive(window->NoEncriptionCheck,1);
} else if (!yon_char_is_empty(hash)) {
gtk_widget_set_sensitive(window->HashBox,1);
gtk_widget_set_sensitive(window->PasswordBox,0);
gtk_widget_set_sensitive(window->NoEncriptionCheck,0);
} else {
gtk_widget_set_sensitive(window->HashBox,0);
gtk_widget_set_sensitive(window->PasswordBox,1);
}
}
password_window *yon_password_window_new(){ password_window *yon_password_window_new(){
GtkBuilder *builder = gtk_builder_new_from_resource(glade_password_path); GtkBuilder *builder = gtk_builder_new_from_resource(glade_password_path);
password_window *window = malloc(sizeof(password_window)); password_window *window = malloc(sizeof(password_window));
@ -1608,10 +1652,16 @@ password_window *yon_password_window_new(){
window->PasswordHashEntry = yon_gtk_builder_get_widget(builder,"PasswordHashEntry"); window->PasswordHashEntry = yon_gtk_builder_get_widget(builder,"PasswordHashEntry");
window->UserCancelButton = yon_gtk_builder_get_widget(builder,"UserCancelButton"); window->UserCancelButton = yon_gtk_builder_get_widget(builder,"UserCancelButton");
window->AcceptButton = yon_gtk_builder_get_widget(builder,"UserOkButton"); window->AcceptButton = yon_gtk_builder_get_widget(builder,"UserOkButton");
window->PasswordBox = yon_gtk_builder_get_widget(builder,"PasswordBox");
window->HashBox = yon_gtk_builder_get_widget(builder,"HashBox");
window->old_password=NULL; window->old_password=NULL;
g_signal_connect(G_OBJECT(window->UserCancelButton),"clicked",G_CALLBACK(on_subwindow_close),NULL); g_signal_connect(G_OBJECT(window->UserCancelButton),"clicked",G_CALLBACK(on_subwindow_close),NULL);
g_signal_connect(G_OBJECT(window->NoEncriptionCheck),"toggled",G_CALLBACK(yon_gtk_widget_set_sensitive_from_toggle_button_inversed),window->PasswordHashEntry); g_signal_connect(G_OBJECT(window->EncryptionCombo),"changed",G_CALLBACK(on_password_hash_sensitiveness),window);
g_signal_connect(G_OBJECT(window->NoEncriptionCheck),"toggled",G_CALLBACK(on_password_hash_sensitiveness),window);
g_signal_connect(G_OBJECT(window->PasswordHashEntry),"changed",G_CALLBACK(on_password_hash_sensitiveness),window);
g_signal_connect(G_OBJECT(window->PasswordEntry),"changed",G_CALLBACK(on_password_hash_sensitiveness),window);
g_signal_connect(G_OBJECT(window->RepeatPasswordEntry),"changed",G_CALLBACK(on_password_hash_sensitiveness),window);
gtk_widget_show(window->Window); gtk_widget_show(window->Window);
return window; return window;
} }

4
source/ubl-settings-update.h
Unescape View File

@ -279,6 +279,9 @@ typedef struct {
GtkWidget *UserCancelButton; GtkWidget *UserCancelButton;
GtkWidget *AcceptButton; GtkWidget *AcceptButton;
GtkWidget *PasswordBox;
GtkWidget *HashBox;
const char *old_password; const char *old_password;
} password_window; } password_window;
@ -385,4 +388,5 @@ void on_mirror_configure_accept(GtkWidget *, dictionary *dict);
char *yon_password_unencrypted_password_get(password_window *window); char *yon_password_unencrypted_password_get(password_window *window);
char *yon_password_hash_get(password_window *window); char *yon_password_hash_get(password_window *window);
void yon_hash_entry_sensitiveness_update(GtkWidget *, password_window *dialog); void yon_hash_entry_sensitiveness_update(GtkWidget *, password_window *dialog);
void on_password_hash_sensitiveness(GtkWidget *,password_window *window);
#endif #endif

36
ubl-settings-update-password.glade
Unescape View File

@ -188,41 +188,41 @@
<packing> <packing>
<property name="expand">True</property> <property name="expand">True</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">2</property> <property name="position">1</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkBox" id="HashBox"> <object class="GtkCheckButton" id="NoEncriptionCheck">
<property name="visible">True</property> <property name="label" translatable="yes">Do not encrypt password</property>
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">5</property>
<child>
<object class="GtkSeparator">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="sensitive">False</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
<property name="draw-indicator">True</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">0</property> <property name="position">2</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkCheckButton" id="NoEncriptionCheck"> <object class="GtkSeparator">
<property name="label" translatable="yes">Do not encrypt password</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="sensitive">False</property> <property name="can-focus">False</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
<property name="draw-indicator">True</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">1</property> <property name="position">3</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkBox" id="HashBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">5</property>
<child> <child>
<object class="GtkBox"> <object class="GtkBox">
<property name="visible">True</property> <property name="visible">True</property>
@ -268,7 +268,7 @@
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">3</property> <property name="position">4</property>
</packing> </packing>
</child> </child>
</object> </object>

Write Preview
Loading…
Cancel
Save