Skip to contentSkip to conversation

idmapd: allow non-ASCII characters (UTF-8) in NFSv4 domain name

PATCH In review Suresh Jayaraman 2 participants 3 messages Dec 13, 2012 – Dec 14, 2012

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 idmapd: allow non-ASCII characters (UTF-8) in NFSv4 domain name

The validateascii() check in imconv() maps NFSv4 domain names with non-ASCII characters to 'nobody'. In setups where Active directory or LDAP is used this causes names with UTF-8 characters to be mapped to 'nobody' because of this check.

As Bruce Fields puts it:

"idmapd doesn't seem like the right place to enforce restrictions on names. Once the system has allowed a name it's too late to be complaining about it here."

Remove the check from imconv() and remove the validateascii() function itself as the only user of that function is being removed by this patch.

---

 utils/idmapd/idmapd.c |   24 ------------------------
 1 file changed, 24 deletions(-)
utils/idmapd/idmapd.c +0 -24
index e80efb4..fe47dac 100644
@@ -145,7 +145,6 @@ static void svrreopen(int, short, void *);
 static int  nfsopen(struct idmap_client *);
 static void nfscb(int, short, void *);
 static void nfsdcb(int, short, void *);
-static int  validateascii(char *, u_int32_t);
 static int  addfield(char **, ssize_t *, char *);
 static int  getfield(char **, char *, size_t);
 
@@ -652,10 +651,6 @@ imconv(struct idmap_client *ic, struct idmap_msg *im)
 			    im->im_id, im->im_name);
 		break;
 	case IDMAP_CONV_NAMETOID:
-		if (validateascii(im->im_name, sizeof(im->im_name)) == -1) {
-			im->im_status |= IDMAP_STATUS_INVALIDMSG;
-			return;
-		}
 		nametoidres(im);
 		if (verbose > 1)
 			xlog_warn("%s %s: (%s) name \"%s\" -> id \"%d\"",
@@ -855,25 +850,6 @@ nametoidres(struct idmap_msg *im)
 }
 
 static int
-validateascii(char *string, u_int32_t len)
-{
-	u_int32_t i;
-
-	for (i = 0; i < len; i++) {
-		if (string[i] == '\0')
-			break;
-
-		if (string[i] & 0x80)
-			return (-1);
-	}
-
-	if ((i >= len) || string[i] != '\0')
-		return (-1);
-
-	return (i + 1);
-}
-
-static int
 addfield(char **bpp, ssize_t *bsizp, char *fld)
 {
 	char ch, *bp = *bpp;
#1 lore raw
Quoted 6 lines · Suresh Jayaraman

The validateascii() check in imconv() maps NFSv4 domain names with non-ASCII characters to 'nobody'. In setups where Active directory or LDAP is used this causes names with UTF-8 characters to be mapped to 'nobody' because of this check.

Quoted 8 lines

As Bruce Fields puts it:

"idmapd doesn't seem like the right place to enforce restrictions on names. Once the system has allowed a name it's too late to be complaining about it here."

Remove the check from imconv() and remove the validateascii() function itself as the only user of that function is being removed by this patch.

Thanks, seem fine. The only other thing I notice is that validateascii() also checks (in a slightly strange way) for null termination of the string, and it's the only place in idmapd that does.

But I think it'd be a kernel bug to pass up a non-terminated string here, so skipping that check is fine too.

Possibly worth a comment, or a check just for null-termination if you want to be extra-careful.

--b.

Quoted 38 lines
utils/idmapd/idmapd.c +0 -23
@@ -652,10 +651,6 @@ imconv(struct idmap_client *ic, struct idmap_msg *im)
 			    im->im_id, im->im_name);
 		break;
 	case IDMAP_CONV_NAMETOID:
-		if (validateascii(im->im_name, sizeof(im->im_name)) == -1) {
-			im->im_status |= IDMAP_STATUS_INVALIDMSG;
-			return;
-		}
 		nametoidres(im);
 		if (verbose > 1)
 			xlog_warn("%s %s: (%s) name \"%s\" -> id \"%d\"",
@@ -855,25 +850,6 @@ nametoidres(struct idmap_msg *im)
 }
 
 static int
-validateascii(char *string, u_int32_t len)
-{
-	u_int32_t i;
-
-	for (i = 0; i < len; i++) {
-		if (string[i] == '\0')
-			break;
-
-		if (string[i] & 0x80)
-			return (-1);
-	}
-
-	if ((i >= len) || string[i] != '\0')
-		return (-1);
-
-	return (i + 1);
-}
-
-static int
 addfield(char **bpp, ssize_t *bsizp, char *fld)
 {
 	char ch, *bp = *bpp;
#2 lore raw
Quoted 20 lines · J. Bruce Fields
Quoted 6 lines · Suresh Jayaraman

The validateascii() check in imconv() maps NFSv4 domain names with non-ASCII characters to 'nobody'. In setups where Active directory or LDAP is used this causes names with UTF-8 characters to be mapped to 'nobody' because of this check.

Quoted 8 lines

As Bruce Fields puts it:

"idmapd doesn't seem like the right place to enforce restrictions on names. Once the system has allowed a name it's too late to be complaining about it here."

Remove the check from imconv() and remove the validateascii() function itself as the only user of that function is being removed by this patch.

Thanks, seem fine. The only other thing I notice is that validateascii() also checks (in a slightly strange way) for null termination of the string, and it's the only place in idmapd that does.

Quoted 6 lines

But I think it'd be a kernel bug to pass up a non-terminated string here, so skipping that check is fine too.

Possibly worth a comment, or a check just for null-termination if you want to be extra-careful.

You are right. I think being extra-careful is Ok. I'll respin this patch with a null-termination check.

Thanks

Signature · 1 line
Suresh Jayaraman