File nautilus-share-183413-restore-write-permissions... of Package nautilus-share

Overview Repositories Revisions Requests Users Attributes Meta

File nautilus-share-183413-restore-write-permissions.diff of Package nautilus-share (Revision ade7df0d7bdc1dce00e591b4bcad661b)

Currently displaying revision ade7df0d7bdc1dce00e591b4bcad661b , Show latest

2006-06-14  Federico Mena Quintero  <federico@novell.com>

Fix https://bugzilla.novell.com/show_bug.cgi?id=183413:

* src/nautilus-share.c (PropertyPage): Add a "was_writable"
	field.  We'll use this to know if we need to change the folder's
	permissions once share gets modified:  we want to be able to
	remove write permission as soon as possible if the share gets
	modified to be read-only.
	(create_property_page): Set page->was_writable.
	(NEED_ALWAYS_MASK, NEED_IF_WRITABLE_MASK, NEED_ALL_MASK): New
	macros for the sets of permissions that we may need to change in
	the usershared folder.
	(remove_from_saved_permissions): New function.  Removes a subset
	of permissions from the ones we had saved previously.
	(restore_write_permissions): New helper function.
	(restore_saved_permissions): Use remove_from_saved_permissions()
	with NEED_ALL_MASK so that we remove all the permissions that we
	added previously.
	(property_page_commit): If the page is no longer writable, restore
	the write permissions that we added.
--- nautilus-share/src/nautilus-share.c	13 Jun 2006 20:06:32 -0000	1.19
+++ nautilus-share/src/nautilus-share.c	14 Jun 2006 16:39:20 -0000
@@ -56,6 +56,9 @@
 #include "shares.h"
 
 
+#define NEED_ALWAYS_MASK      (S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH)	/* all usershares need go+rx */
+#define NEED_IF_WRITABLE_MASK (S_IWGRP | S_IWOTH)			/* writable usershares need go+w additionally*/
+#define NEED_ALL_MASK         (NEED_ALWAYS_MASK | NEED_IF_WRITABLE_MASK)
 
 static GObjectClass *parent_class;
 
@@ -83,6 +86,7 @@ typedef struct {
   GtkWidget *standalone_window;
 
   gboolean was_initially_shared;
+  gboolean was_writable;
   gboolean is_dirty;
 } PropertyPage;
 
@@ -324,50 +328,75 @@ remove_permissions (const char *path, mo
 }
 
 static void
-restore_saved_permissions (const char *path)
+remove_from_saved_permissions (const char *path, mode_t remove_mask)
 {
   GKeyFile *key_file;
   char *key_file_path;
 
+  if (remove_mask == 0)
+    return;
+
   key_file = g_key_file_new ();
   key_file_path = get_key_file_path ();
 
-  if (!g_key_file_load_from_file (key_file, key_file_path, 0, NULL))
-    goto out;
-
-  if (g_key_file_has_group (key_file, path))
+  if (g_key_file_load_from_file (key_file, key_file_path, 0, NULL))
     {
+      mode_t need_mask;
+      mode_t remove_from_current_mask;
       char *str;
 
+      need_mask = 0;
+
       /* NULL GError */
       str = g_key_file_get_string (key_file, path, "need_mask", NULL);
 
       if (str)
 	{
 	  guint i;
-	  mode_t need_mask;
 
 	  if (sscanf (str, "%o", &i) == 1) /* octal */
-	    {
-	      need_mask = i;
-	      remove_permissions (path, need_mask);
-	    }
+	    need_mask = i;
 
 	  g_free (str);
 	}
-      
-      /* NULL GError */
-      g_key_file_remove_group (key_file, path, NULL);
+
+      remove_from_current_mask = need_mask & remove_mask;
+      remove_permissions (path, remove_from_current_mask);
+
+      need_mask &= ~remove_mask;
+
+      if (need_mask == 0)
+	{
+	  /* NULL GError */
+	  g_key_file_remove_group (key_file, path, NULL);
+	}
+      else
+	{
+	  char buf[50];
+
+	  g_snprintf (buf, sizeof (buf), "%o", (guint) need_mask); /* octal */
+	  g_key_file_set_string (key_file, path, "need_mask", buf);
+	}
 
       save_key_file (key_file_path, key_file);
     }
 
- out:
-
   g_key_file_free (key_file);
   g_free (key_file_path);
 }
 
+static void
+restore_saved_permissions (const char *path)
+{
+  remove_from_saved_permissions (path, NEED_ALL_MASK);
+}
+
+static void
+restore_write_permissions (const char *path)
+{
+  remove_from_saved_permissions (path, NEED_IF_WRITABLE_MASK);
+}
+
 typedef enum {
   CONFIRM_CANCEL_OR_ERROR,
   CONFIRM_NO_MODIFICATIONS,
@@ -387,10 +416,10 @@ confirm_sharing_permissions (GtkWidget *
     return CONFIRM_NO_MODIFICATIONS; /* We'll just let "net usershare" give back an error if the file disappears */
 
   mode = st.st_mode;
-  new_mode = mode | (S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH); /* ... add go+rx */
+  new_mode = mode | NEED_ALWAYS_MASK;
 
   if (is_writable)
-    new_mode |= S_IWGRP | S_IWOTH; /* ... add go+w */
+    new_mode |= NEED_IF_WRITABLE_MASK;
 
   need_mask = new_mode & ~mode;
 
@@ -437,6 +466,10 @@ property_page_commit (PropertyPage *page
   share_info.comment = (char *) gtk_entry_get_text (GTK_ENTRY (page->entry_share_comment));
   share_info.is_writable = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (page->checkbutton_share_rw_ro));
 
+  /* Do we need to unset the write permissions that we added in the past? */
+  if (is_shared && page->was_writable && !share_info.is_writable)
+    restore_write_permissions (page->path);
+
   status = confirm_sharing_permissions (page->main, page->path, is_shared, share_info.is_writable);
   if (status == CONFIRM_CANCEL_OR_ERROR)
     return FALSE; /* the user didn't want us to change his folder's permissions */
@@ -729,7 +762,10 @@ create_property_page (NautilusFileInfo *
 	    && page->button_apply != NULL);
 
   if (share_info)
-    page->was_initially_shared = TRUE;
+    {
+      page->was_initially_shared = TRUE;
+      page->was_writable = share_info->is_writable;
+    }
 
   /* Share name */

Places

File nautilus-share-183413-restore-write-permissions.diff of Package nautilus-share (Revision ade7df0d7bdc1dce00e591b4bcad661b)

Places