logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git

0007-Disable-uidmap-and-gidmap-support.patch (3372B)

    

  1. From 71731981d5d726647ca768a643479e7ad757868b Mon Sep 17 00:00:00 2001
  2. From: Michael Forney <mforney@mforney.org>
  3. Date: Sun, 5 Jun 2016 18:24:16 -0700
  4. Subject: [PATCH] Disable uidmap and gidmap support
  6. ---
  7.  sshfs.c | 16 ++++++++++++++++
  8.  1 file changed, 16 insertions(+)
  10. diff --git a/sshfs.c b/sshfs.c
  11. index 42ff750..472f98c 100644
  12. --- a/sshfs.c
  13. +++ b/sshfs.c
  14. @@ -248,10 +248,12 @@ struct sshfs {
  15.  	char *mountpoint;
  16.  	char *uid_file;
  17.  	char *gid_file;
  18. +#if 0
  19.  	GHashTable *uid_map;
  20.  	GHashTable *gid_map;
  21.  	GHashTable *r_uid_map;
  22.  	GHashTable *r_gid_map;
  23. +#endif
  24.  	unsigned max_read;
  25.  	unsigned max_write;
  26.  	unsigned ssh_ver;
  27. @@ -384,7 +386,9 @@ enum {
  28.  enum {
  29.  	IDMAP_NONE,
  30.  	IDMAP_USER,
  31. +#if 0
  32.  	IDMAP_FILE,
  33. +#endif
  34.  };
  35.  
  36.  enum {
  37. @@ -405,7 +409,9 @@ static struct fuse_opt sshfs_opts[] = {
  38.  	SSHFS_OPT("workaround=%s",     workarounds, 0),
  39.  	SSHFS_OPT("idmap=none",        idmap, IDMAP_NONE),
  40.  	SSHFS_OPT("idmap=user",        idmap, IDMAP_USER),
  41. +#if 0
  42.  	SSHFS_OPT("idmap=file",        idmap, IDMAP_FILE),
  43. +#endif
  44.  	SSHFS_OPT("uidfile=%s",        uid_file, 0),
  45.  	SSHFS_OPT("gidfile=%s",        gid_file, 0),
  46.  	SSHFS_OPT("nomap=ignore",      nomap, NOMAP_IGNORE),
  47. @@ -554,6 +560,7 @@ static int list_empty(const struct list_head *head)
  48.  	return head->next == head;
  49.  }
  50.  
  51. +#if 0
  52.  /* given a pointer to the uid/gid, and the mapping table, remap the
  53.   * uid/gid, if necessary */
  54.  static inline int translate_id(uint32_t *id, GHashTable *map)
  55. @@ -571,6 +578,7 @@ static inline int translate_id(uint32_t *id, GHashTable *map)
  56.  		abort();
  57.  	}
  58.  }
  59. +#endif
  60.  
  61.  static inline void buf_init(struct buffer *buf, size_t size)
  62.  {
  63. @@ -813,12 +821,14 @@ static int buf_get_attrs(struct buffer *buf, struct stat *stbuf, int *flagsp)
  64.  		if (gid == sshfs.remote_gid)
  65.  			gid = sshfs.local_gid;
  66.  	}
  67. +#if 0
  68.  	if (sshfs.idmap == IDMAP_FILE && sshfs.uid_map)
  69.  		if (translate_id(&uid, sshfs.uid_map) == -1)
  70.  			return -EPERM;
  71.  	if (sshfs.idmap == IDMAP_FILE && sshfs.gid_map)
  72.  		if (translate_id(&gid, sshfs.gid_map) == -1)
  73.  			return -EPERM;
  74. +#endif
  75.  
  76.  	memset(stbuf, 0, sizeof(struct stat));
  77.  	stbuf->st_mode = mode;
  78. @@ -2473,12 +2483,14 @@ static int sshfs_chown(const char *path, uid_t uid, gid_t gid,
  79.  		if (gid == sshfs.local_gid)
  80.  			gid = sshfs.remote_gid;
  81.  	}
  82. +#if 0
  83.  	if (sshfs.idmap == IDMAP_FILE && sshfs.r_uid_map)
  84.  		if(translate_id(&uid, sshfs.r_uid_map) == -1)
  85.  			return -EPERM;
  86.  	if (sshfs.idmap == IDMAP_FILE && sshfs.r_gid_map)
  87.  		if (translate_id(&gid, sshfs.r_gid_map) == -1)
  88.  			return -EPERM;
  89. +#endif
  90.  
  91.  	buf_init(&buf, 0);
  92.  	if (sf == NULL)
  93. @@ -3782,6 +3794,7 @@ static int ssh_connect(void)
  94.  	return 0;
  95.  }
  96.  
  97. +#if 0
  98.  /* number of ':' separated fields in a passwd/group file that we care
  99.   * about */
  100.  #define IDMAP_FIELDS 3
  101. @@ -3956,6 +3969,7 @@ static inline void load_gid_map(void)
  102.  {
  103.  	read_id_map(sshfs.gid_file, &groupname_to_gid, "gid", &sshfs.gid_map, &sshfs.r_gid_map);
  104.  }
  105. +#endif
  106.  
  107.  #ifdef __APPLE__
  108.  int main(int argc, char *argv[], __unused char *envp[], char **exec_path)
  109. @@ -4052,6 +4066,7 @@ int main(int argc, char *argv[])
  110.  
  111.  	if (sshfs.idmap == IDMAP_USER)
  112.  		sshfs.detect_uid = 1;
  113. +#if 0
  114.  	else if (sshfs.idmap == IDMAP_FILE) {
  115.  		sshfs.uid_map = NULL;
  116.  		sshfs.gid_map = NULL;
  117. @@ -4066,6 +4081,7 @@ int main(int argc, char *argv[])
  118.  		if (sshfs.gid_file)
  119.  			load_gid_map();
  120.  	}
  121. +#endif
  122.  	free(sshfs.uid_file);
  123.  	free(sshfs.gid_file);
  124.  
  125. -- 
  126. 2.24.0