Merge lp:~gue5t/midori/nojs-local-pages into lp:midori

[gue5t gue5t]

Replace NoJS "allow all pages" setting with "allow local pages"

Right now NoJS has a setting "Allow all sites" which is better served by simply disabling the extension temporarily. This branch replaces it with an "Allow local pages" setting.

[Paweł Forysiuk (tuxator)]

review: Approve

=== modified file 'extensions/nojs/main.c'
--- extensions/nojs/main.c	2013-05-22 22:59:27 +0000
+++ extensions/nojs/main.c	2014-05-09 14:51:38 +0000
@@ -22,7 +22,7 @@
 
 	noJS=nojs_new(inExtension, inApp);
 	nojs_set_policy_for_unknown_domain(noJS, midori_extension_get_integer(inExtension, "unknown-domain-policy"));
-	nojs_set_allow_all_sites(noJS, midori_extension_get_boolean(inExtension, "allow-all-sites"));
+	nojs_set_allow_local_pages(noJS, midori_extension_get_boolean(inExtension, "allow-local-pages"));
 	nojs_set_only_second_level_domain(noJS, midori_extension_get_boolean(inExtension, "only-second-level"));
 }
 
@@ -68,7 +68,7 @@
 												NULL);
 
 	midori_extension_install_integer(extension, "unknown-domain-policy", NOJS_POLICY_BLOCK);
-	midori_extension_install_boolean(extension, "allow-all-sites", FALSE);
+	midori_extension_install_boolean(extension, "allow-local-pages", TRUE);
 	midori_extension_install_boolean(extension, "only-second-level", TRUE);
 
 	g_signal_connect(extension, "activate", G_CALLBACK(_nojs_on_activate), NULL);
 
=== modified file 'extensions/nojs/nojs-preferences.c'
--- extensions/nojs/nojs-preferences.c	2013-08-16 22:02:25 +0000
+++ extensions/nojs/nojs-preferences.c	2014-05-09 14:51:38 +0000
@@ -46,19 +46,19 @@
 	GtkWidget				*editingCombo;
 	GtkWidget				*deleteButton;
 	GtkWidget				*deleteAllButton;
-	GtkWidget				*allowAllSitesCheckbox;
+	GtkWidget				*allowLocalPagesCheckbox;
 	GtkWidget				*blockUnknownDomainsCheckbox;
 	GtkWidget				*checkSecondLevelOnlyCheckbox;
 	GtkWidget				*addDomainEntry;
 	GtkWidget				*addDomainPolicyCombo;
 	GtkWidget				*addDomainButton;
 
-	gint					signalAllowAllSitesToggledID;
+	gint					signalAllowLocalPagesToggledID;
 	gint					signalBlockUnknownDomainsToggledID;
 	gint					signalCheckSecondLevelOnlyToggledID;
 
 	gint					signalManagerChangedDatabaseID;
-	gint					signalManagerChangedAllowAllSitesID;
+	gint					signalManagerChangedAllowLocalPagesID;
 	gint					signalManagerChangedUnknownDomainPolicyID;
 	gint					signalManagerChangedCheckSecondLevelID;
 };
@@ -324,23 +324,23 @@
 	return;
 }
 
-/* Allow-all-sites changed in check-box or manager */
-static void _nojs_preferences_on_allow_all_sites_changed(NoJSPreferences *self,
+/* Allow-local-pages changed in check-box or manager */
+static void _nojs_preferences_on_allow_local_pages_changed(NoJSPreferences *self,
 																gpointer *inUserData)
 {
 	NoJSPreferencesPrivate	*priv=self->priv;
 	gboolean				state;
 
 	/* Get toggle state of widget (but block signal for manager) and set in manager */
-	g_signal_handler_block(priv->manager, priv->signalManagerChangedAllowAllSitesID);
-
-	state=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(priv->allowAllSitesCheckbox));
-	nojs_set_allow_all_sites(priv->manager, state);
-
-	g_signal_handler_unblock(priv->manager, priv->signalManagerChangedAllowAllSitesID);
+	g_signal_handler_block(priv->manager, priv->signalManagerChangedAllowLocalPagesID);
+
+	state=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(priv->allowLocalPagesCheckbox));
+	nojs_set_allow_local_pages(priv->manager, state);
+
+	g_signal_handler_unblock(priv->manager, priv->signalManagerChangedAllowLocalPagesID);
 }
 
-static void _nojs_preferences_on_manager_allow_all_sites_changed(NoJSPreferences *self,
+static void _nojs_preferences_on_manager_allow_local_pages_changed(NoJSPreferences *self,
 																	GParamSpec *inSpec,
 																	gpointer inUserData)
 {
@@ -349,14 +349,14 @@
 	gboolean				state;
 
 	/* Get new value from manager */
-	state=nojs_get_allow_all_sites(manager);
+	state=nojs_get_allow_local_pages(manager);
 
 	/* Set toggle in widget (but block signal for toggle) */
-	g_signal_handler_block(priv->allowAllSitesCheckbox, priv->signalAllowAllSitesToggledID);
-
-	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(priv->allowAllSitesCheckbox), state);
-
-	g_signal_handler_unblock(priv->allowAllSitesCheckbox, priv->signalAllowAllSitesToggledID);
+	g_signal_handler_block(priv->allowLocalPagesCheckbox, priv->signalAllowLocalPagesToggledID);
+
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(priv->allowLocalPagesCheckbox), state);
+
+	g_signal_handler_unblock(priv->allowLocalPagesCheckbox, priv->signalAllowLocalPagesToggledID);
 }
 
 /* Block-unknown-domains changed in check-box or manager */
@@ -675,8 +675,8 @@
 		if(priv->signalManagerChangedDatabaseID) g_signal_handler_disconnect(priv->manager, priv->signalManagerChangedDatabaseID);
 		priv->signalManagerChangedDatabaseID=0;
 
-		if(priv->signalManagerChangedAllowAllSitesID) g_signal_handler_disconnect(priv->manager, priv->signalManagerChangedAllowAllSitesID);
-		priv->signalManagerChangedAllowAllSitesID=0;
+		if(priv->signalManagerChangedAllowLocalPagesID) g_signal_handler_disconnect(priv->manager, priv->signalManagerChangedAllowLocalPagesID);
+		priv->signalManagerChangedAllowLocalPagesID=0;
 
 		if(priv->signalManagerChangedUnknownDomainPolicyID) g_signal_handler_disconnect(priv->manager, priv->signalManagerChangedUnknownDomainPolicyID);
 		priv->signalManagerChangedUnknownDomainPolicyID=0;
@@ -712,8 +712,8 @@
 				if(priv->signalManagerChangedDatabaseID) g_signal_handler_disconnect(priv->manager, priv->signalManagerChangedDatabaseID);
 				priv->signalManagerChangedDatabaseID=0;
 
-				if(priv->signalManagerChangedAllowAllSitesID) g_signal_handler_disconnect(priv->manager, priv->signalManagerChangedAllowAllSitesID);
-				priv->signalManagerChangedAllowAllSitesID=0;
+				if(priv->signalManagerChangedAllowLocalPagesID) g_signal_handler_disconnect(priv->manager, priv->signalManagerChangedAllowLocalPagesID);
+				priv->signalManagerChangedAllowLocalPagesID=0;
 
 				if(priv->signalManagerChangedUnknownDomainPolicyID) g_signal_handler_disconnect(priv->manager, priv->signalManagerChangedUnknownDomainPolicyID);
 				priv->signalManagerChangedUnknownDomainPolicyID=0;
@@ -740,12 +740,12 @@
 												self);
 				_nojs_preferences_on_manager_database_changed(self, NULL, priv->manager);
 
-				priv->signalManagerChangedAllowAllSitesID=
+				priv->signalManagerChangedAllowLocalPagesID=
 					g_signal_connect_swapped(priv->manager,
-												"notify::allow-all-sites",
-												G_CALLBACK(_nojs_preferences_on_manager_allow_all_sites_changed),
+												"notify::allow-local-pages",
+												G_CALLBACK(_nojs_preferences_on_manager_allow_local_pages_changed),
 												self);
-				_nojs_preferences_on_manager_allow_all_sites_changed(self, NULL, priv->manager);
+				_nojs_preferences_on_manager_allow_local_pages_changed(self, NULL, priv->manager);
 
 				priv->signalManagerChangedUnknownDomainPolicyID=
 					g_signal_connect_swapped(priv->manager,
@@ -983,13 +983,13 @@
 
 	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 5);
 
-	/* Add "allow-all-sites" checkbox */
-	priv->allowAllSitesCheckbox=gtk_check_button_new_with_mnemonic(_("A_llow scripts at all sites"));
-	priv->signalAllowAllSitesToggledID=g_signal_connect_swapped(priv->allowAllSitesCheckbox,
+	/* Add "allow-local-pages" checkbox */
+	priv->allowLocalPagesCheckbox=gtk_check_button_new_with_mnemonic(_("A_llow scripts on local pages"));
+	priv->signalAllowLocalPagesToggledID=g_signal_connect_swapped(priv->allowLocalPagesCheckbox,
 																"toggled",
-																G_CALLBACK(_nojs_preferences_on_allow_all_sites_changed),
+																G_CALLBACK(_nojs_preferences_on_allow_local_pages_changed),
 																self);
-	gtk_box_pack_start(GTK_BOX(vbox), priv->allowAllSitesCheckbox, FALSE, TRUE, 5);
+	gtk_box_pack_start(GTK_BOX(vbox), priv->allowLocalPagesCheckbox, FALSE, TRUE, 5);
 
 	/* Add "block-unknown-domains" checkbox */
 	priv->blockUnknownDomainsCheckbox=gtk_check_button_new_with_mnemonic(_("Bloc_k scripts at unknown domains by default"));
 
=== modified file 'extensions/nojs/nojs-view.c'
--- extensions/nojs/nojs-view.c	2013-07-29 18:03:02 +0000
+++ extensions/nojs/nojs-view.c	2014-05-09 14:51:38 +0000
@@ -354,7 +354,7 @@
 		gboolean			newScriptsEnabled;
 
 		domain=nojs_get_domain(priv->manager, uri);
-		policy=nojs_get_policy(priv->manager, domain);
+		policy=nojs_get_policy(priv->manager, uri);
 		if(policy==NOJS_POLICY_UNDETERMINED)
 		{
 			policy=nojs_get_policy_for_unknown_domain(priv->manager);
@@ -371,8 +371,11 @@
 			// TODO: Set uri also to ensure this uri is going to be reloaded
 		}
 
-		_nojs_view_add_site_to_menu(self, domain, policy);
-		if(domain) g_free(domain);
+		if(domain)
+		{
+			_nojs_view_add_site_to_menu(self, domain, policy);
+			g_free(domain);
+		}
 	}
 
 	/* Free allocated resources */
 
=== modified file 'extensions/nojs/nojs.c'
--- extensions/nojs/nojs.c	2013-09-16 23:18:48 +0000
+++ extensions/nojs/nojs.c	2014-05-09 14:51:38 +0000
@@ -29,7 +29,7 @@
 
 	PROP_DATABASE,
 	PROP_DATABASE_FILENAME,
-	PROP_ALLOW_ALL_SITES,
+	PROP_ALLOW_LOCAL_PAGES,
 	PROP_ONLY_SECOND_LEVEL,
 	PROP_UNKNOWN_DOMAIN_POLICY,
 
@@ -60,7 +60,7 @@
 	MidoriApp						*application;
 	sqlite3							*database;
 	gchar							*databaseFilename;
-	gboolean						allowAllSites;
+	gboolean						allowLocalPages;
 	gboolean						checkOnlySecondLevel;
 	NoJSPolicy						unknownDomainPolicy;
 
@@ -285,7 +285,6 @@
 	const gchar				*contentType;
 	SoupURI					*uri;
 	gchar					*uriText;
-	gchar					*domain;
 	NoJSPolicy				policy;
 	gboolean				isJS;
 	const gchar				**iter;
@@ -315,11 +314,8 @@
 	 * get policy for domain of URI and emit signal
 	 */
 	uri=soup_message_get_uri(message);
-
-	domain=nojs_get_domain(self, uri);
-	g_return_if_fail(domain);
-
-	policy=nojs_get_policy(self, domain);
+	policy=nojs_get_policy(self, uri);
+
 	if(policy==NOJS_POLICY_UNDETERMINED)
 	{
 		g_warning("Got invalid policy. Using default policy for unknown domains.");
@@ -331,7 +327,6 @@
 	g_signal_emit(self, NoJSSignals[URI_LOAD_POLICY_STATUS], 0, uriText, policy==NOJS_POLICY_UNDETERMINED ? NOJS_POLICY_BLOCK : policy);
 
 	g_free(uriText);
-	g_free(domain);
 
 	/* Return here if policy is any type of accept */
 	if(policy!=NOJS_POLICY_UNDETERMINED && policy!=NOJS_POLICY_BLOCK) return;
@@ -636,9 +631,9 @@
 			_nojs_on_application_changed(self);
 			break;
 
-		case PROP_ALLOW_ALL_SITES:
-			self->priv->allowAllSites=g_value_get_boolean(inValue);
-			g_object_notify_by_pspec(G_OBJECT(self), NoJSProperties[PROP_ALLOW_ALL_SITES]);
+		case PROP_ALLOW_LOCAL_PAGES:
+			self->priv->allowLocalPages=g_value_get_boolean(inValue);
+			g_object_notify_by_pspec(G_OBJECT(self), NoJSProperties[PROP_ALLOW_LOCAL_PAGES]);
 			break;
 
 		case PROP_ONLY_SECOND_LEVEL:
@@ -682,8 +677,8 @@
 			g_value_set_string(outValue, self->priv->databaseFilename);
 			break;
 
-		case PROP_ALLOW_ALL_SITES:
-			g_value_set_boolean(outValue, self->priv->allowAllSites);
+		case PROP_ALLOW_LOCAL_PAGES:
+			g_value_set_boolean(outValue, self->priv->allowLocalPages);
 			break;
 
 		case PROP_ONLY_SECOND_LEVEL:
@@ -743,24 +738,24 @@
 								NULL,
 								G_PARAM_READABLE);
 
-	NoJSProperties[PROP_ALLOW_ALL_SITES]=
-		g_param_spec_boolean("allow-all-sites",
-								_("Allow all sites"),
-								_("If true this extension will not check policy for each site but allow them."),
-								FALSE,
+	NoJSProperties[PROP_ALLOW_LOCAL_PAGES]=
+		g_param_spec_boolean("allow-local-pages",
+								_("Allow local pages"),
+								_("Allow scripts to run on local (file://) pages"),
+								TRUE,
 								G_PARAM_READWRITE | G_PARAM_CONSTRUCT);
 
 	NoJSProperties[PROP_ONLY_SECOND_LEVEL]=
 		g_param_spec_boolean("only-second-level",
 								_("Only second level"),
-								_("If true this extension will reduce each domain to its second-level (www.example.org will reduced to example.org)"),
+								_("Reduce each domain to its second-level (e.g. www.example.org to example.org) for comparison"),
 								TRUE,
 								G_PARAM_READWRITE | G_PARAM_CONSTRUCT);
 
 	NoJSProperties[PROP_UNKNOWN_DOMAIN_POLICY]=
 		g_param_spec_enum("unknown-domain-policy",
 								_("Unknown domain policy"),
-								_("Policy to use for unknown domains."),
+								_("Policy to use for unknown domains"),
 								NOJS_TYPE_POLICY,
 								NOJS_POLICY_BLOCK,
 								G_PARAM_READWRITE | G_PARAM_CONSTRUCT);
@@ -843,7 +838,7 @@
 	/* Set up default values */
 	priv->database=NULL;
 	priv->databaseFilename=NULL;
-	priv->allowAllSites=FALSE;
+	priv->allowLocalPages=TRUE;
 	priv->checkOnlySecondLevel=TRUE;
 	priv->unknownDomainPolicy=NOJS_POLICY_BLOCK;
 
@@ -888,22 +883,30 @@
 }
 
 /* Get/set policy for javascript from site */
-gint nojs_get_policy(NoJS *self, const gchar *inDomain)
+gint nojs_get_policy(NoJS *self, SoupURI *inURI)
 {
 	g_return_val_if_fail(IS_NOJS(self), NOJS_POLICY_UNDETERMINED);
-	g_return_val_if_fail(inDomain, NOJS_POLICY_UNDETERMINED);
+	g_return_val_if_fail(inURI, NOJS_POLICY_UNDETERMINED);
 
 	NoJSPrivate			*priv=self->priv;
 	sqlite3_stmt		*statement=NULL;
 	gint				error;
 	gint				policy=NOJS_POLICY_UNDETERMINED;
+	gchar				*inDomain;
 
-	/* Check to allow all sites */
-	if(priv->allowAllSites) return(NOJS_POLICY_ACCEPT);
+	/* Check to allow local pages */
+	if(soup_uri_get_scheme(inURI) == SOUP_URI_SCHEME_FILE)
+	{
+		if(priv->allowLocalPages) return(NOJS_POLICY_ACCEPT);
+		else return(priv->unknownDomainPolicy);
+	}
 
 	/* Check for open database */
 	g_return_val_if_fail(priv->database, policy);
 
+	/* Get domain from URI */
+	inDomain=nojs_get_domain(self, inURI);
+
 	/* Lookup policy for site in database */
 	error=sqlite3_prepare_v2(priv->database,
 								"SELECT site, value FROM policies WHERE site LIKE ? LIMIT 1;",
@@ -975,23 +978,23 @@
 	}
 }
 
-/* Get/set flag to allow javascript at all sites */
-gboolean nojs_get_allow_all_sites(NoJS *self)
+/* Get/set flag to allow javascript on local pages */
+gboolean nojs_get_allow_local_pages(NoJS *self)
 {
 	g_return_val_if_fail(IS_NOJS(self), TRUE);
 
-	return(self->priv->allowAllSites);
+	return(self->priv->allowLocalPages);
 }
 
-void nojs_set_allow_all_sites(NoJS *self, gboolean inAllow)
+void nojs_set_allow_local_pages(NoJS *self, gboolean inAllow)
 {
 	g_return_if_fail(IS_NOJS(self));
 
-	if(self->priv->allowAllSites!=inAllow)
+	if(self->priv->allowLocalPages!=inAllow)
 	{
-		self->priv->allowAllSites=inAllow;
-		midori_extension_set_boolean(self->priv->extension, "allow-all-sites", inAllow);
-		g_object_notify_by_pspec(G_OBJECT(self), NoJSProperties[PROP_ALLOW_ALL_SITES]);
+		self->priv->allowLocalPages=inAllow;
+		midori_extension_set_boolean(self->priv->extension, "allow-local-pages", inAllow);
+		g_object_notify_by_pspec(G_OBJECT(self), NoJSProperties[PROP_ALLOW_LOCAL_PAGES]);
 	}
 }
 
 
=== modified file 'extensions/nojs/nojs.h'
--- extensions/nojs/nojs.h	2013-07-05 10:29:59 +0000
+++ extensions/nojs/nojs.h	2014-05-09 14:51:38 +0000
@@ -66,14 +66,14 @@
 
 gchar* nojs_get_domain(NoJS *self, SoupURI *inURI);
 
-gint nojs_get_policy(NoJS *self, const gchar *inDomain);
+gint nojs_get_policy(NoJS *self, SoupURI *inURI);
 void nojs_set_policy(NoJS *self, const gchar *inDomain, NoJSPolicy inPolicy);
 
 NoJSPolicy nojs_get_policy_for_unknown_domain(NoJS *self);
 void nojs_set_policy_for_unknown_domain(NoJS *self, NoJSPolicy inPolicy);
 
-gboolean nojs_get_allow_all_sites(NoJS *self);
-void nojs_set_allow_all_sites(NoJS *self, gboolean inAllow);
+gboolean nojs_get_allow_local_pages(NoJS *self);
+void nojs_set_allow_local_pages(NoJS *self, gboolean inAllow);
 
 gboolean nojs_get_only_second_level_domain(NoJS *self);
 void nojs_set_only_second_level_domain(NoJS *self, gboolean inOnlySecondLevel);