Kolab Groupware OBS

cyrus-imapd.spec Changed

cyrus-imapd-2.5.tar.gz/cmulocal/sasl2.m4 Changed

cyrus-imapd-2.5.tar.gz/configure.ac Changed

cyrus-imapd-2.5.tar.gz/cunit/imapurl.testc Changed

cyrus-imapd-2.5.tar.gz/cunit/mboxname.testc Changed

@@ -49,41 +49,278 @@
     CU_ASSERT_EQUAL(c, 'J');
 }
 
-static void test_to_parts(void)
+static void test_mboxname_to_parts_user(void)
 {
-    static const char FRED_DRAFTS = "user.fred.Drafts";
-    static const char JANEAT_SENT = "bloggs.com!user.jane.Sent";
-    static const char SHARED = "shared.Gossip";
-    static const char SHAREDAT = "foonly.com!shared.Tattle";
+    static const char USER = "user.john";
+    static const char USER_SUB = "user.john.sub";
+
+    struct mboxname_parts parts;
+    int r;
+
+    r = mboxname_to_parts(USER, &parts);
+    CU_ASSERT_EQUAL(r, 0);
+    CU_ASSERT_PTR_NULL(parts.domain);
+    CU_ASSERT_EQUAL(parts.is_deleted, 0);
+    CU_ASSERT_STRING_EQUAL(parts.userid, "john");
+    CU_ASSERT_PTR_NULL(parts.box);
+    mboxname_free_parts(&parts);
+
+    r = mboxname_to_parts(USER_SUB, &parts);
+    CU_ASSERT_EQUAL(r, 0);
+    CU_ASSERT_PTR_NULL(parts.domain);
+    CU_ASSERT_EQUAL(parts.is_deleted, 0);
+    CU_ASSERT_STRING_EQUAL(parts.userid, "john");
+    CU_ASSERT_STRING_EQUAL(parts.box, "sub");
+    mboxname_free_parts(&parts);
+}
+
+static void test_mboxname_to_parts_duser(void)
+{
+    static const char DUSER = "example.org!user.john";
+    static const char DUSER_SUB = "example.org!user.john.sub";
+
+    struct mboxname_parts parts;
+    int r;
+
+    r = mboxname_to_parts(DUSER, &parts);
+    CU_ASSERT_EQUAL(r, 0);
+    CU_ASSERT_STRING_EQUAL(parts.domain, "example.org");
+    CU_ASSERT_EQUAL(parts.is_deleted, 0);
+    CU_ASSERT_STRING_EQUAL(parts.userid, "john");
+    CU_ASSERT_PTR_NULL(parts.box);
+    mboxname_free_parts(&parts);
+
+    r = mboxname_to_parts(DUSER_SUB, &parts);
+    CU_ASSERT_EQUAL(r, 0);
+    CU_ASSERT_STRING_EQUAL(parts.domain, "example.org");
+    CU_ASSERT_EQUAL(parts.is_deleted, 0);
+    CU_ASSERT_STRING_EQUAL(parts.userid, "john");
+    CU_ASSERT_STRING_EQUAL(parts.box, "sub");
+    mboxname_free_parts(&parts);
+}
+
+static void test_mboxname_to_parts_suser(void)
+{
+    static const char SUSER = "user.john^doe";
+    static const char SUSER_SUB = "user.john^doe.sub";
+
+    struct mboxname_parts parts;
+    int r;
+
+    r = mboxname_to_parts(SUSER, &parts);
+    CU_ASSERT_EQUAL(r, 0);
+    CU_ASSERT_PTR_NULL(parts.domain);
+    CU_ASSERT_EQUAL(parts.is_deleted, 0);
+    CU_ASSERT_STRING_EQUAL(parts.userid, "john^doe");
+    CU_ASSERT_PTR_NULL(parts.box);
+    mboxname_free_parts(&parts);
+
+    r = mboxname_to_parts(SUSER_SUB, &parts);
+    CU_ASSERT_EQUAL(r, 0);
+    CU_ASSERT_PTR_NULL(parts.domain);
+    CU_ASSERT_EQUAL(parts.is_deleted, 0);
+    CU_ASSERT_STRING_EQUAL(parts.userid, "john^doe");
+    CU_ASSERT_STRING_EQUAL(parts.box, "sub");
+    mboxname_free_parts(&parts);
+}
+
+static void test_mboxname_to_parts_sduser(void)
+{
+    static const char SDUSER = "example.org!user.john^doe";
+    static const char SDUSER_SUB = "example.org!user.john^doe.sub";
+
     struct mboxname_parts parts;
     int r;
 
-    r = mboxname_to_parts(FRED_DRAFTS, &parts);
+    r = mboxname_to_parts(SDUSER, &parts);
+    CU_ASSERT_EQUAL(r, 0);
+    CU_ASSERT_STRING_EQUAL(parts.domain, "example.org");
+    CU_ASSERT_EQUAL(parts.is_deleted, 0);
+    CU_ASSERT_STRING_EQUAL(parts.userid, "john^doe");
+    CU_ASSERT_PTR_NULL(parts.box);
+    mboxname_free_parts(&parts);
+
+    r = mboxname_to_parts(SDUSER_SUB, &parts);
+    CU_ASSERT_EQUAL(r, 0);
+    CU_ASSERT_STRING_EQUAL(parts.domain, "example.org");
+    CU_ASSERT_EQUAL(parts.is_deleted, 0);
+    CU_ASSERT_STRING_EQUAL(parts.userid, "john^doe");
+    CU_ASSERT_STRING_EQUAL(parts.box, "sub");
+    mboxname_free_parts(&parts);
+}
+
+static void test_mboxname_to_parts_xuser(void)
+{
+    static const char XUSER = "DELETED.user.john";
+    static const char XUSER_SUB = "DELETED.user.john.sub";
+
+    struct mboxname_parts parts;
+    int r;
+
+    r = mboxname_to_parts(XUSER, &parts);
+    CU_ASSERT_EQUAL(r, 0);
+    CU_ASSERT_PTR_NULL(parts.domain);
+    CU_ASSERT_EQUAL(parts.is_deleted, 1);
+    CU_ASSERT_STRING_EQUAL(parts.userid, "john");
+    CU_ASSERT_PTR_NULL(parts.box);
+    mboxname_free_parts(&parts);
+
+    r = mboxname_to_parts(XUSER_SUB, &parts);
+    CU_ASSERT_EQUAL(r, 0);
+    CU_ASSERT_PTR_NULL(parts.domain);
+    CU_ASSERT_EQUAL(parts.is_deleted, 1);
+    CU_ASSERT_STRING_EQUAL(parts.userid, "john");
+    CU_ASSERT_STRING_EQUAL(parts.box, "sub");
+    mboxname_free_parts(&parts);
+}
+
+static void test_mboxname_to_parts_sxuser(void)
+{
+    static const char SXUSER = "DELETED.user.john^doe";
+    static const char SXUSER_SUB = "DELETED.user.john^doe.sub";
+
+    struct mboxname_parts parts;
+    int r;
+
+    r = mboxname_to_parts(SXUSER, &parts);
+    CU_ASSERT_EQUAL(r, 0);
+    CU_ASSERT_PTR_NULL(parts.domain);
+    CU_ASSERT_EQUAL(parts.is_deleted, 1);
+    CU_ASSERT_STRING_EQUAL(parts.userid, "john^doe");
+    CU_ASSERT_PTR_NULL(parts.box);
+    mboxname_free_parts(&parts);
+
+    r = mboxname_to_parts(SXUSER_SUB, &parts);
     CU_ASSERT_EQUAL(r, 0);
     CU_ASSERT_PTR_NULL(parts.domain);
-    CU_ASSERT_STRING_EQUAL(parts.userid, "fred");
-    CU_ASSERT_STRING_EQUAL(parts.box, "Drafts");
+    CU_ASSERT_EQUAL(parts.is_deleted, 1);
+    CU_ASSERT_STRING_EQUAL(parts.userid, "john^doe");
+    CU_ASSERT_STRING_EQUAL(parts.box, "sub");
+    mboxname_free_parts(&parts);
+}
+
+static void test_mboxname_to_parts_dxuser(void)
+{
+    static const char DXUSER = "example.org!DELETED.user.john";
+    static const char DXUSER_SUB = "example.org!DELETED.user.john.sub";
+
+    struct mboxname_parts parts;
+    int r;
+
+    r = mboxname_to_parts(DXUSER, &parts);
+    CU_ASSERT_EQUAL(r, 0);
+    CU_ASSERT_STRING_EQUAL(parts.domain, "example.org");
+    CU_ASSERT_EQUAL(parts.is_deleted, 1);
+    CU_ASSERT_STRING_EQUAL(parts.userid, "john");
+    CU_ASSERT_PTR_NULL(parts.box);
     mboxname_free_parts(&parts);
 
-    r = mboxname_to_parts(JANEAT_SENT, &parts);
+    r = mboxname_to_parts(DXUSER_SUB, &parts);
+    CU_ASSERT_EQUAL(r, 0);
+    CU_ASSERT_STRING_EQUAL(parts.domain, "example.org");
+    CU_ASSERT_EQUAL(parts.is_deleted, 1);
+    CU_ASSERT_STRING_EQUAL(parts.userid, "john");
+    CU_ASSERT_STRING_EQUAL(parts.box, "sub");
+    mboxname_free_parts(&parts);
+}
+
+static void test_mboxname_to_parts_dsxuser(void)
+{
+    static const char DSXUSER = "example.org!DELETED.user.john^doe";
+    static const char DSXUSER_SUB = "example.org!DELETED.user.john^doe.sub";
+
+    struct mboxname_parts parts;
+    int r;
+
+    r = mboxname_to_parts(DSXUSER, &parts);
     CU_ASSERT_EQUAL(r, 0);
-    CU_ASSERT_STRING_EQUAL(parts.domain, "bloggs.com");
-    CU_ASSERT_STRING_EQUAL(parts.userid, "jane");
-    CU_ASSERT_STRING_EQUAL(parts.box, "Sent");
+    CU_ASSERT_STRING_EQUAL(parts.domain, "example.org");
+    CU_ASSERT_EQUAL(parts.is_deleted, 1);
+    CU_ASSERT_STRING_EQUAL(parts.userid, "john^doe");
+    CU_ASSERT_PTR_NULL(parts.box);
     mboxname_free_parts(&parts);
 
+    r = mboxname_to_parts(DSXUSER_SUB, &parts);
+    CU_ASSERT_EQUAL(r, 0);
+    CU_ASSERT_STRING_EQUAL(parts.domain, "example.org");
+    CU_ASSERT_EQUAL(parts.is_deleted, 1);
+    CU_ASSERT_STRING_EQUAL(parts.userid, "john^doe");
+    CU_ASSERT_STRING_EQUAL(parts.box, "sub");
+    mboxname_free_parts(&parts);
+}
+
+static void test_mboxname_to_parts_shared(void)
+{
+    static const char SHARED = "shared.foo";
+    static const char SHARED_SUB = "shared.foo.bar";
+
+    struct mboxname_parts parts;
+    int r;
+
     r = mboxname_to_parts(SHARED, &parts);
     CU_ASSERT_EQUAL(r, 0);
     CU_ASSERT_PTR_NULL(parts.domain);
+    CU_ASSERT_EQUAL(parts.is_deleted, 0);
+    CU_ASSERT_PTR_NULL(parts.userid);
+    CU_ASSERT_STRING_EQUAL(parts.box, "shared.foo");
+    mboxname_free_parts(&parts);
+
+    r = mboxname_to_parts(SHARED_SUB, &parts);
+    CU_ASSERT_EQUAL(r, 0);
+    CU_ASSERT_PTR_NULL(parts.domain);
+    CU_ASSERT_EQUAL(parts.is_deleted, 0);
+    CU_ASSERT_PTR_NULL(parts.userid);
+    CU_ASSERT_STRING_EQUAL(parts.box, "shared.foo.bar");
+    mboxname_free_parts(&parts);
+}
+
+static void test_mboxname_to_parts_dshared(void)
+{
+    static const char DSHARED = "example.org!shared.foo";
+    static const char DSHARED_SUB = "example.org!shared.foo.bar";
+
+    struct mboxname_parts parts;
+    int r;
+
+    r = mboxname_to_parts(DSHARED, &parts);
+    CU_ASSERT_EQUAL(r, 0);
+    CU_ASSERT_STRING_EQUAL(parts.domain, "example.org");
+    CU_ASSERT_EQUAL(parts.is_deleted, 0);
     CU_ASSERT_PTR_NULL(parts.userid);
-    CU_ASSERT_STRING_EQUAL(parts.box, "shared.Gossip");
+    CU_ASSERT_STRING_EQUAL(parts.box, "shared.foo");
     mboxname_free_parts(&parts);
 
-    r = mboxname_to_parts(SHAREDAT, &parts);
+    r = mboxname_to_parts(DSHARED_SUB, &parts);
     CU_ASSERT_EQUAL(r, 0);
-    CU_ASSERT_STRING_EQUAL(parts.domain, "foonly.com");
+    CU_ASSERT_STRING_EQUAL(parts.domain, "example.org");
+    CU_ASSERT_EQUAL(parts.is_deleted, 0);
     CU_ASSERT_PTR_NULL(parts.userid);
-    CU_ASSERT_STRING_EQUAL(parts.box, "shared.Tattle");
+    CU_ASSERT_STRING_EQUAL(parts.box, "shared.foo.bar");
+    mboxname_free_parts(&parts);
+}
+
+static void test_mboxname_to_parts_dxshared(void)
+{
+    static const char DXSHARED = "example.org!DELETED.shared.foo";
+    static const char DXSHARED_SUB = "example.org!DELETED.shared.foo.bar";
+
+    struct mboxname_parts parts;
+    int r;
+
+    r = mboxname_to_parts(DXSHARED, &parts);
+    CU_ASSERT_EQUAL(r, 0);
+    CU_ASSERT_STRING_EQUAL(parts.domain, "example.org");
+    CU_ASSERT_EQUAL(parts.is_deleted, 1);
+    CU_ASSERT_PTR_NULL(parts.userid);
+    CU_ASSERT_STRING_EQUAL(parts.box, "shared.foo");
+    mboxname_free_parts(&parts);
+
+    r = mboxname_to_parts(DXSHARED_SUB, &parts);
+    CU_ASSERT_EQUAL(r, 0);
+    CU_ASSERT_STRING_EQUAL(parts.domain, "example.org");
+    CU_ASSERT_EQUAL(parts.is_deleted, 1);
+    CU_ASSERT_PTR_NULL(parts.userid);
+    CU_ASSERT_STRING_EQUAL(parts.box, "shared.foo.bar");
     mboxname_free_parts(&parts);
 }
 
@@ -348,8 +585,49 @@
     toexternal_helper("user.jane", "Uvvers.jane");
     toexternal_helper("user.jane.baz", "Uvvers.jane.baz");
     toexternal_helper("shared.quux", "Chaired.shared.quux");
+
+    conf.virtdomains = IMAP_ENUM_VIRTDOMAINS_ON;
+    toexternal_helper("example.org!shared.quux", "Chaired.shared.quux@example.org");
+    conf.userid = "john@example.org";
+    toexternal_helper("example.org!shared.quux", "Chaired.shared.quux");
+    conf.isadmin = 1;
+    toexternal_helper("example.org!shared.quux", "shared.quux");
+
+}
+
+static void test_altnamespace_unixhierarchysep(void)
+{
+    memset(&conf, 0, sizeof(conf));
+    conf.altnamespace = 1;
+    conf.unixhierarchysep = 1;
+    conf.userprefix = "Other Users";
+    conf.sharedprefix = "Shared Folders";
+    conf.isadmin = 1;
+
+    toexternal_helper("user.fred", "user/fred");
+    toexternal_helper("user.fred.foo", "user/fred/foo");
+    toexternal_helper("user.fred.foo.barracuda", "user/fred/foo/barracuda");
+
+    conf.isadmin = 0;
+    conf.userid = "fred";
+
+    toexternal_helper("user.jane", "Other Users/jane");
+    toexternal_helper("user.jane.baz", "Other Users/jane/baz");
+    toexternal_helper("shared.quux", "Shared Folders/shared/quux");
+
+    conf.virtdomains = IMAP_ENUM_VIRTDOMAINS_ON;
+    conf.userid = "fred@example.org";
+    toexternal_helper("example.org!shared.quux", "Shared Folders/shared/quux");
+
+    conf.isadmin = 1;
+    toexternal_helper("example.org!shared.quux", "shared/quux");
+
+    conf.userid = "cyrus-admin";
+    toexternal_helper("example.org!shared.quux", "shared/quux@example.org");
+
 }
 
+
 static enum enum_value old_config_virtdomains;
 
 static int set_up(void)

cyrus-imapd-2.5.tar.gz/imap/mboxevent.c Changed

cyrus-imapd-2.5.tar.gz/imap/mboxname.c Changed

@@ -565,84 +565,41 @@
 }
 
 /* Handle conversion from the internal namespace to the alternate namespace */
-static int mboxname_toexternal_alt(struct namespace *namespace, const char *name,
+static int mboxname_toexternal_alt(struct namespace *namespace, const char *mboxname,
 				  const char *userid, char *result)
 {
-    char *domain;
-    size_t userlen, resultlen;
-
-    /* Blank the result, just in case */
-    result0 = '\0';
-
-    if(strlen(name) > MAX_MAILBOX_NAME) return IMAP_MAILBOX_BADNAME;
-    
-    if (!userid) return IMAP_MAILBOX_BADNAME;
-
-    userlen = strlen(userid);
+    char iresultMAX_MAILBOX_NAME;
+    int r = 0;
 
-    if (config_virtdomains && (domain = strchr(userid, '@'))) {
-	size_t domainlen = strlen(domain);
+    // Make this abundantly simple
+    mboxname_toexternal(namespace, mboxname, userid, iresult);
 
-	userlen = domain - userid;
+    r = strncasecmp(iresult, "inbox", 5);
 
-	if (!strncmp(name, domain+1, domainlen-1) &&
-	    namedomainlen-1 == '!') {
-	    name += domainlen;
+    if (!r) {
+	if (iresult5 == '\0') {
+	    sprintf(result, "%s", iresult);
+	} else if (iresult5 == namespace->hier_sep) {
+	    sprintf(result, "%s", iresult+6);
 	}
-    }
 
-    /* Personal (INBOX) namespace */
-    if (!strncasecmp(name, "inbox", 5) &&
-	(name5 == '\0' || name5 == '.')) {
-	if (name5 == '\0')
-	    strcpy(result, name);
-	else
-	    strcpy(result, name+6);
-    }
-    /* paranoia - this shouldn't be needed */
-    else if (!strncmp(name, "user.", 5) &&
-	     !strncmp(name+5, userid, userlen) &&
-	     (name5+userlen == '\0' ||
-	      name5+userlen == '.')) {
-	if (name5+userlen == '\0')
-	    strcpy(result, "INBOX");
-	else
-	    strcpy(result, name+5+userlen+1);
+	return 0;
     }
 
-    /* Other Users namespace */
-    else if (!strncmp(name, "user", 4) &&
-	     (name4 == '\0' || name4 == '.')) {
-	size_t prefixlen = strlen(namespace->prefixNAMESPACE_USER);
-
-	if ((prefixlen > MAX_MAILBOX_NAME) || 
-	    ((name4 == '.') && 
-	     ((prefixlen+1+strlen(name+5)) > MAX_MAILBOX_NAME)))
-	    return IMAP_MAILBOX_BADNAME;
+    r = strncasecmp(iresult, "user", 4);
 
-	sprintf(result, "%.*s",
-		(int) (prefixlen-1), namespace->prefixNAMESPACE_USER);
-	resultlen = strlen(result);
-	if (name4 == '.') {
-	    sprintf(result+resultlen, "%c%s", namespace->hier_sep, name+5);
+    if (!r) {
+	if (iresult4 == namespace->hier_sep) {
+	    // The namespace already has a hierarchy separator
+	    sprintf(result, "%s%s", namespace->prefixNAMESPACE_USER, iresult+5);
 	}
-    }
 
-    /* Shared namespace */
-    else {
-	/* special case:  LIST/LSUB "" % */
-	if (!strncmp(name, namespace->prefixNAMESPACE_SHARED,
-		     strlen(namespace->prefixNAMESPACE_SHARED)-1)) {
-	    strcpy(result, name);
-	}
-	else {
-	    strcpy(result, namespace->prefixNAMESPACE_SHARED);
-	    strcat(result, name);
-	}
+	return 0;
     }
 
-    /* Translate any separators in mailboxname */
-    mboxname_hiersep_toexternal(namespace, result, 0);
+    // The namespace already has a hierarchy separator
+    sprintf(result, "%s%s", namespace->prefixNAMESPACE_SHARED, iresult);
+
     return 0;
 }

cyrus-imapd-2.5.tar.gz/sieve/bc_emit.c Changed

cyrus-imapd-2.5.tar.gz/sieve/bc_eval.c Changed

@@ -360,10 +360,10 @@
 
     switch(op)
     {
-    case BC_FALSE:
+    case BC_FALSE:/*0*/
 	res=0; i++; break;
 
-    case BC_TRUE:
+    case BC_TRUE:/*1*/
 	res=1; i++; break;
 
     case BC_NOT:/*2*/
@@ -468,7 +468,7 @@
 	const struct address *a;
 	char *addr;
 
-	int headersi=address+i+5;/* the i value for the begining of the headers */
+	int headersi=address+i+5;/* the i value for the beginning of the headers */
 	int datai=(ntohl(bcheadersi+1.value)/4);
 
 	int numheaders=ntohl(bcheadersi.len);
@@ -668,7 +668,7 @@
     {
 	const char** val;
 
-	int headersi=i+5;/*the i value for the begining of hte headers*/
+	int headersi=i+5;/*the i value for the beginning of the headers*/
 	int datai=(ntohl(bcheadersi+1.value)/4);
 
 	int numheaders=ntohl(bcheadersi.len);
@@ -816,7 +816,7 @@
 	sieve_bodypart_t ** val;
 	const char **content_types = NULL;
 
-	int typesi=i+6;/* the i value for the begining of the content-types */
+	int typesi=i+6;/* the i value for the beginning of the content-types */
  	int datai=(ntohl(bctypesi+1.value)/4);
 
 	int numdata=ntohl(bcdatai.len);
@@ -1305,17 +1305,17 @@
 	    break;
 	}
 
-	case B_MARK:/*8*/
+	case B_MARK:/*7*/
 	    res = do_mark(actions);
 	    ip++;
 	    break;
 
-	case B_UNMARK:/*9*/
+	case B_UNMARK:/*8*/
 	    res = do_unmark(actions);
 	    ip++;
 	    break;
 
-	case B_ADDFLAG:/*10*/ 
+	case B_ADDFLAG:/*9*/
 	{
 	    int x;
 	    int list_len=ntohl(bcip+1.len);
@@ -1333,7 +1333,7 @@
 	    break;
 	}
 
-	case B_SETFLAG:
+	case B_SETFLAG:/*10*/
 	{
 	    int x;
 	    int list_len=ntohl(bcip+1.len);
@@ -1360,7 +1360,7 @@
 	    break;
 	}
 
-	case B_REMOVEFLAG:
+	case B_REMOVEFLAG:/*11*/
 	{
 	    int x;
 	    int list_len=ntohl(bcip+1.len);
@@ -1378,7 +1378,7 @@
 	    break;
 	}
 
-	case B_NOTIFY:
+	case B_NOTIFY:/*12*/
 	{
 	    const char * id;
 	    const char * method;
@@ -1428,7 +1428,7 @@
 
 	    break;
 	}
-	case B_DENOTIFY:
+	case B_DENOTIFY:/*13*/
 	{
          /*
 	  * i really have no idea what the count matchtype should do here.
@@ -1511,8 +1511,8 @@
 	    
 	    break;
 	}
-	case B_VACATION_ORIG:
-	case B_VACATION:
+	case B_VACATION_ORIG:/*14*/
+	case B_VACATION:/*21*/
 	{
 	    int respond;
 	    char *fromaddr = NULL; /* relative to message we send */

cyrus-imapd.dsc Changed

debian.changelog Changed

Changes of Revision 98