X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=etc%2Fcnid_dbd%2Fcmd_dbd_scanvol.c;h=a91f43716dd196c8a11ba56c8678c501dd8f2c97;hb=3858412d6efa2798fdc9b3f5613275e49dd63513;hp=1d6d6a920287f112e51a84e72a147d3464392776;hpb=008eac9cd4113c38090c803b1236335158fcc64c;p=netatalk.git diff --git a/etc/cnid_dbd/cmd_dbd_scanvol.c b/etc/cnid_dbd/cmd_dbd_scanvol.c index 1d6d6a92..a91f4371 100644 --- a/etc/cnid_dbd/cmd_dbd_scanvol.c +++ b/etc/cnid_dbd/cmd_dbd_scanvol.c @@ -1,6 +1,4 @@ /* - $Id: cmd_dbd_scanvol.c,v 1.10 2009-10-14 01:38:28 didg Exp $ - Copyright (c) 2009 Frank Lahm This program is free software; you can redistribute it and/or modify @@ -27,10 +25,16 @@ #include #include #include + #include #include #include #include +#include +#include +#include +#include + #include "cmd_dbd.h" #include "dbif.h" #include "db_param.h" @@ -40,11 +44,9 @@ #define ADDIR_OK (addir_ok == 0) #define ADFILE_OK (adfile_ok == 0) -/* These must be accessible for cmd_dbd_* funcs */ -struct volinfo *volinfo; -char cwdbuf[MAXPATHLEN+1]; -/* Some static vars */ +static struct volinfo *myvolinfo; +static char cwdbuf[MAXPATHLEN+1]; static DBD *dbd; static DBD *dbd_rebuild; static dbd_flags_t dbd_flags; @@ -54,9 +56,15 @@ static char *netatalk_dirs[] = { ".AppleDesktop", NULL }; +static char *special_dirs[] = { + ".zfs", + NULL +}; static struct cnid_dbd_rqst rqst; static struct cnid_dbd_rply rply; static jmp_buf jmp; +static struct vol volume; /* fake it for ea_open */ +static char pname[MAXPATHLEN] = "../"; /* Taken form afpd/desktop.c @@ -75,22 +83,22 @@ static char *utompath(char *upath) u = upath; outlen = strlen(upath); - if ((volinfo->v_casefold & AFPVOL_UTOMUPPER)) + if ((myvolinfo->v_casefold & AFPVOL_UTOMUPPER)) flags |= CONV_TOUPPER; - else if ((volinfo->v_casefold & AFPVOL_UTOMLOWER)) + else if ((myvolinfo->v_casefold & AFPVOL_UTOMLOWER)) flags |= CONV_TOLOWER; - if ((volinfo->v_flags & AFPVOL_EILSEQ)) { + if ((myvolinfo->v_flags & AFPVOL_EILSEQ)) { flags |= CONV__EILSEQ; } /* convert charsets */ - if ((size_t)-1 == ( outlen = convert_charset(volinfo->v_volcharset, + if ((size_t)-1 == ( outlen = convert_charset(myvolinfo->v_volcharset, CH_UTF8_MAC, - volinfo->v_maccharset, + myvolinfo->v_maccharset, u, outlen, mpath, MAXPATHLEN, &flags)) ) { dbd_log( LOGSTD, "Conversion from %s to %s for %s failed.", - volinfo->v_volcodepage, volinfo->v_maccodepage, u); + myvolinfo->v_volcodepage, myvolinfo->v_maccodepage, u); return NULL; } @@ -116,17 +124,17 @@ static char *mtoupath(char *mpath) } /* set conversion flags */ - if (!(volinfo->v_flags & AFPVOL_NOHEX)) + if (!(myvolinfo->v_flags & AFPVOL_NOHEX)) flags |= CONV_ESCAPEHEX; - if (!(volinfo->v_flags & AFPVOL_USEDOTS)) + if (!(myvolinfo->v_flags & AFPVOL_USEDOTS)) flags |= CONV_ESCAPEDOTS; - if ((volinfo->v_casefold & AFPVOL_MTOUUPPER)) + if ((myvolinfo->v_casefold & AFPVOL_MTOUUPPER)) flags |= CONV_TOUPPER; - else if ((volinfo->v_casefold & AFPVOL_MTOULOWER)) + else if ((myvolinfo->v_casefold & AFPVOL_MTOULOWER)) flags |= CONV_TOLOWER; - if ((volinfo->v_flags & AFPVOL_EILSEQ)) { + if ((myvolinfo->v_flags & AFPVOL_EILSEQ)) { flags |= CONV__EILSEQ; } @@ -137,17 +145,96 @@ static char *mtoupath(char *mpath) outlen = MAXPATHLEN; if ((size_t)-1 == (outlen = convert_charset(CH_UTF8_MAC, - volinfo->v_volcharset, - volinfo->v_maccharset, + myvolinfo->v_volcharset, + myvolinfo->v_maccharset, m, inplen, u, outlen, &flags)) ) { dbd_log( LOGSTD, "conversion from UTF8-MAC to %s for %s failed.", - volinfo->v_volcodepage, mpath); + myvolinfo->v_volcodepage, mpath); return NULL; } return( upath ); } +#if 0 +/* + Check if "name" is pointing to + a) an object inside the current volume (return 0) + b) an object outside the current volume (return 1) + Then stats the pointed to object and if it is a dir ors ADFLAGS_DIR to *adflags + Return -1 on any serious error. + */ +static int check_symlink(const char *name, int *adflags) +{ + int cwd; + ssize_t len; + char pathbuf[MAXPATHLEN + 1]; + char *sep; + struct stat st; + + if ((len = readlink(name, pathbuf, MAXPATHLEN)) == -1) { + dbd_log(LOGSTD, "Error reading link info for '%s/%s': %s", + cwdbuf, name, strerror(errno)); + return -1; + } + pathbuf[len] = 0; + + if ((stat(pathbuf, &st)) != 0) { + dbd_log(LOGSTD, "stat error '%s': %s", pathbuf, strerror(errno)); + } + + /* Remember cwd */ + if ((cwd = open(".", O_RDONLY)) < 0) { + dbd_log(LOGSTD, "error opening cwd '%s': %s", cwdbuf, strerror(errno)); + return -1; + } + + if (S_ISDIR(st.st_mode)) { + *adflags |= ADFLAGS_DIR; + } else { /* file */ + /* get basename from path */ + if ((sep = strrchr(pathbuf, '/')) == NULL) + /* just a file at the same level */ + return 0; + sep = 0; /* pathbuf now contains the directory*/ + } + + /* fchdir() to pathbuf so we can easily get its path with getcwd() */ + if ((chdir(pathbuf)) != 0) { + dbd_log(LOGSTD, "Cant chdir to '%s': %s", pathbuf, strerror(errno)); + return -1; + } + + if ((getcwd(pathbuf, MAXPATHLEN)) == NULL) { + dbd_log(LOGSTD, "Cant get symlink'ed dir '%s/%s': %s", cwdbuf, pathbuf, strerror(errno)); + if ((fchdir(cwd)) != 0) + /* We're foobared */ + longjmp(jmp, 1); /* this jumps back to cmd_dbd_scanvol() */ + return -1; + } + + if ((fchdir(cwd)) != 0) + /* We're foobared */ + longjmp(jmp, 1); /* this jumps back to cmd_dbd_scanvol() */ + + /* + We now have the symlink target dir as absoulte path in pathbuf + and can compare it with the currents volume path + */ + int i = 0; + while (myvolinfo->v_path[i]) { + if ((pathbuf[i] == 0) || (myvolinfo->v_path[i] != pathbuf[i])) { + dbd_log( LOGDEBUG, "extra-share symlink '%s/%s', following", cwdbuf, name); + return 1; + } + i++; + } + + dbd_log( LOGDEBUG, "intra-share symlink '%s/%s', not following", cwdbuf, name); + return 0; +} +#endif + /* Check for wrong encoding e.g. "." at the beginning is not CAP encoded (:2e) although volume is default !AFPVOL_USEDOTS. We do it by roundtripiping from volcharset to UTF8-MAC and back and then compare the result. @@ -185,6 +272,21 @@ static const char *check_netatalk_dirs(const char *name) return NULL; } +/* + Check for special names + Returns pointer to name or NULL. +*/ +static const char *check_special_dirs(const char *name) +{ + int c; + + for (c=0; special_dirs[c]; c++) { + if ((strcmp(name, special_dirs[c])) == 0) + return special_dirs[c]; + } + return NULL; +} + /* Check for .AppleDouble file, create if missing */ @@ -194,12 +296,15 @@ static int check_adfile(const char *fname, const struct stat *st) struct adouble ad; char *adname; + if (dbd_flags & DBD_FLAGS_CLEANUP) + return 0; + if (S_ISREG(st->st_mode)) adflags = 0; else adflags = ADFLAGS_DIR; - adname = volinfo->ad_path(fname, adflags); + adname = myvolinfo->ad_path(fname, adflags); if ((ret = access( adname, F_OK)) != 0) { if (errno != ENOENT) { @@ -215,7 +320,7 @@ static int check_adfile(const char *fname, const struct stat *st) return -1; /* Create ad file */ - ad_init(&ad, volinfo->v_adouble, volinfo->v_ad_options); + ad_init(&ad, myvolinfo->v_adouble, myvolinfo->v_ad_options); if ((ret = ad_open_metadata( fname, adflags, O_CREAT, &ad)) != 0) { dbd_log( LOGSTD, "Error creating AppleDouble file '%s/%s': %s", @@ -235,7 +340,7 @@ static int check_adfile(const char *fname, const struct stat *st) chmod(adname, st->st_mode); #endif } else { - ad_init(&ad, volinfo->v_adouble, volinfo->v_ad_options); + ad_init(&ad, myvolinfo->v_adouble, myvolinfo->v_ad_options); if (ad_open_metadata( fname, adflags, O_RDONLY, &ad) != 0) { dbd_log( LOGSTD, "Error opening AppleDouble file for '%s/%s'", cwdbuf, fname); return -1; @@ -245,6 +350,103 @@ static int check_adfile(const char *fname, const struct stat *st) return 0; } +/* + Remove all files with file::EA* from adouble dir +*/ +static void remove_eafiles(const char *name, struct ea *ea) +{ + DIR *dp = NULL; + struct dirent *ep; + char eaname[MAXPATHLEN]; + + strlcpy(eaname, name, sizeof(eaname)); + if (strlcat(eaname, "::EA", sizeof(eaname)) >= sizeof(eaname)) { + dbd_log(LOGSTD, "name too long: '%s/%s/%s'", cwdbuf, ADv2_DIRNAME, name); + return; + } + + if ((chdir(ADv2_DIRNAME)) != 0) { + dbd_log(LOGSTD, "Couldn't chdir to '%s/%s': %s", + cwdbuf, ADv2_DIRNAME, strerror(errno)); + return; + } + + if ((dp = opendir(".")) == NULL) { + dbd_log(LOGSTD, "Couldn't open the directory '%s/%s': %s", + cwdbuf, ADv2_DIRNAME, strerror(errno)); + return; + } + + while ((ep = readdir(dp))) { + if (strstr(ep->d_name, eaname) != NULL) { + dbd_log(LOGSTD, "Removing EA file: '%s/%s/%s'", + cwdbuf, ADv2_DIRNAME, ep->d_name); + if ((unlink(ep->d_name)) != 0) { + dbd_log(LOGSTD, "Error unlinking EA file '%s/%s/%s': %s", + cwdbuf, ADv2_DIRNAME, ep->d_name, strerror(errno)); + } + } /* if */ + } /* while */ + + if (dp) + closedir(dp); + +} + +/* + Check Extended Attributes files +*/ +static int check_eafiles(const char *fname) +{ + unsigned int count = 0; + int ret = 0, remove; + struct ea ea; + struct stat st; + char *eaname; + + if ((ret = ea_open(&volume, fname, EA_RDWR, &ea)) != 0) { + if (errno == ENOENT) + return 0; + dbd_log(LOGSTD, "Error calling ea_open for file: %s/%s, removing EA files", cwdbuf, fname); + if ( ! (dbd_flags & DBD_FLAGS_SCAN)) + remove_eafiles(fname, &ea); + return -1; + } + + /* Check all EAs */ + while (count < ea.ea_count) { + dbd_log(LOGDEBUG, "EA: %s", (*ea.ea_entries)[count].ea_name); + remove = 0; + + eaname = ea_path(&ea, (*ea.ea_entries)[count].ea_name, 0); + + if (lstat(eaname, &st) != 0) { + if (errno == ENOENT) + dbd_log(LOGSTD, "Missing EA: %s/%s", cwdbuf, eaname); + else + dbd_log(LOGSTD, "Bogus EA: %s/%s", cwdbuf, eaname); + remove = 1; + } else if (st.st_size != (*ea.ea_entries)[count].ea_size) { + dbd_log(LOGSTD, "Bogus EA: %s/%s, removing it...", cwdbuf, eaname); + remove = 1; + if ((unlink(eaname)) != 0) + dbd_log(LOGSTD, "Error removing EA file '%s/%s': %s", + cwdbuf, eaname, strerror(errno)); + } + + if (remove) { + /* Be CAREFUL here! This should do what ea_delentry does. ea_close relies on it !*/ + free((*ea.ea_entries)[count].ea_name); + (*ea.ea_entries)[count].ea_name = NULL; + } + + count++; + } /* while */ + + ea_close(&ea); + return ret; +} + /* Check for .AppleDouble folder and .Parent, create if missing */ @@ -253,8 +455,11 @@ static int check_addir(int volroot) int addir_ok, adpar_ok; struct stat st; struct adouble ad; - char *mname; - + char *mname = NULL; + + if (dbd_flags & DBD_FLAGS_CLEANUP) + return 0; + /* Check for ad-dir */ if ( (addir_ok = access(ADv2_DIRNAME, F_OK)) != 0) { if (errno != ENOENT) { @@ -265,10 +470,10 @@ static int check_addir(int volroot) } /* Check for ".Parent" */ - if ( (adpar_ok = access(volinfo->ad_path(".", ADFLAGS_DIR), F_OK)) != 0) { + if ( (adpar_ok = access(myvolinfo->ad_path(".", ADFLAGS_DIR), F_OK)) != 0) { if (errno != ENOENT) { dbd_log(LOGSTD, "Access error on '%s/%s': %s", - cwdbuf, volinfo->ad_path(".", ADFLAGS_DIR), strerror(errno)); + cwdbuf, myvolinfo->ad_path(".", ADFLAGS_DIR), strerror(errno)); return -1; } dbd_log(LOGSTD, "Missing .AppleDouble/.Parent for '%s'", cwdbuf); @@ -287,7 +492,7 @@ static int check_addir(int volroot) } /* Create ad dir and set name */ - ad_init(&ad, volinfo->v_adouble, volinfo->v_ad_options); + ad_init(&ad, myvolinfo->v_adouble, myvolinfo->v_ad_options); if (ad_open_metadata( ".", ADFLAGS_DIR, O_CREAT, &ad) != 0) { dbd_log( LOGSTD, "Error creating AppleDouble dir in %s: %s", cwdbuf, strerror(errno)); @@ -295,7 +500,7 @@ static int check_addir(int volroot) } /* Get basename of cwd from cwdbuf */ - utompath(strrchr(cwdbuf, '/') + 1); + mname = utompath(strrchr(cwdbuf, '/') + 1); /* Update name in ad file */ ad_setname(&ad, mname); @@ -303,18 +508,78 @@ static int check_addir(int volroot) ad_close_metadata(&ad); /* Inherit owner/group from "." to ".AppleDouble" and ".Parent" */ - if ((stat(".", &st)) != 0) { + if ((lstat(".", &st)) != 0) { dbd_log( LOGSTD, "Couldnt stat %s: %s", cwdbuf, strerror(errno)); return -1; } chown(ADv2_DIRNAME, st.st_uid, st.st_gid); - chown(volinfo->ad_path(".", ADFLAGS_DIR), st.st_uid, st.st_gid); + chown(myvolinfo->ad_path(".", ADFLAGS_DIR), st.st_uid, st.st_gid); } return 0; } -/* +/* + Check if file cotains "::EA" and if it does check if its correspondig data fork exists. + Returns: + 0 = name is not an EA file + 1 = name is an EA file and no problem was found + -1 = name is an EA file and data fork is gone + */ +static int check_eafile_in_adouble(const char *name) +{ + int ret = 0; + char *namep, *namedup = NULL; + + /* Check if this is an AFPVOL_EA_AD vol */ + if (myvolinfo->v_vfs_ea == AFPVOL_EA_AD) { + /* Does the filename contain "::EA" ? */ + namedup = strdup(name); + if ((namep = strstr(namedup, "::EA")) == NULL) { + ret = 0; + goto ea_check_done; + } else { + /* File contains "::EA" so it's an EA file. Check for data file */ + + /* Get string before "::EA" from EA filename */ + namep[0] = 0; + strlcpy(pname + 3, namedup, sizeof(pname)); /* Prepends "../" */ + + if ((access( pname, F_OK)) == 0) { + ret = 1; + goto ea_check_done; + } else { + ret = -1; + if (errno != ENOENT) { + dbd_log(LOGSTD, "Access error for file '%s/%s': %s", + cwdbuf, name, strerror(errno)); + goto ea_check_done; + } + + /* Orphaned EA file*/ + dbd_log(LOGSTD, "Orphaned Extended Attribute file '%s/%s/%s'", + cwdbuf, ADv2_DIRNAME, name); + + if (dbd_flags & DBD_FLAGS_SCAN) + /* Scan only requested, dont change anything */ + goto ea_check_done; + + if ((unlink(name)) != 0) { + dbd_log(LOGSTD, "Error unlinking orphaned Extended Attribute file '%s/%s/%s'", + cwdbuf, ADv2_DIRNAME, name); + } + } /* if (access) */ + } /* if strstr */ + } /* if AFPVOL_EA_AD */ + +ea_check_done: + if (namedup) + free(namedup); + + return ret; +} + +/* Check files and dirs inside .AppleDouble folder: - remove orphaned files - bail on dirs @@ -324,7 +589,6 @@ static int read_addir(void) DIR *dp; struct dirent *ep; struct stat st; - static char fname[MAXPATHLEN] = "../"; if ((chdir(ADv2_DIRNAME)) != 0) { dbd_log(LOGSTD, "Couldn't chdir to '%s/%s': %s", @@ -346,7 +610,7 @@ static int read_addir(void) if (STRCMP(ep->d_name, ==, ".Parent")) continue; - if ((stat(ep->d_name, &st)) < 0) { + if ((lstat(ep->d_name, &st)) < 0) { dbd_log( LOGSTD, "Lost file or dir while enumeratin dir '%s/%s/%s', probably removed: %s", cwdbuf, ADv2_DIRNAME, ep->d_name, strerror(errno)); continue; @@ -359,12 +623,16 @@ static int read_addir(void) continue; } + /* Check if for orphaned and corrupt Extended Attributes file */ + if (check_eafile_in_adouble(ep->d_name) != 0) + continue; + /* Check for data file */ - strcpy(fname+3, ep->d_name); - if ((access( fname, F_OK)) != 0) { + strcpy(pname + 3, ep->d_name); + if ((access( pname, F_OK)) != 0) { if (errno != ENOENT) { dbd_log(LOGSTD, "Access error for file '%s/%s': %s", - cwdbuf, ep->d_name, strerror(errno)); + cwdbuf, pname, strerror(errno)); continue; } /* Orphaned ad-file*/ @@ -387,7 +655,7 @@ static int read_addir(void) dbd_log(LOGSTD, "Couldn't chdir back to '%s' from AppleDouble dir: %s", cwdbuf, strerror(errno)); /* This really is EOT! */ - exit(1); + longjmp(jmp, 1); /* this jumps back to cmd_dbd_scanvol() */ } closedir(dp); @@ -395,9 +663,11 @@ static int read_addir(void) return 0; } -/* - Check CNID for a file/dir, both from db and from ad-file. - For detailed specs see intro. +/* + Check CNID for a file/dir, both from db and from ad-file. + For detailed specs see intro. + + @return Correct CNID of object or CNID_INVALID (ie 0) on error */ static cnid_t check_cnid(const char *name, cnid_t did, struct stat *st, int adfile_ok, int adflags) { @@ -405,13 +675,28 @@ static cnid_t check_cnid(const char *name, cnid_t did, struct stat *st, int adfi cnid_t db_cnid, ad_cnid; struct adouble ad; + /* Force checkout every X items */ + static int cnidcount = 0; + cnidcount++; + if (cnidcount > 10000) { + cnidcount = 0; + if (dbif_txn_checkpoint(dbd, 0, 0, 0) < 0) { + dbd_log(LOGSTD, "Error checkpointing!"); + return CNID_INVALID; + } + } + /* Get CNID from ad-file if volume is using AFPVOL_CACHE */ ad_cnid = 0; - if ( (volinfo->v_flags & AFPVOL_CACHE) && ADFILE_OK) { - ad_init(&ad, volinfo->v_adouble, volinfo->v_ad_options); + if ( (myvolinfo->v_flags & AFPVOL_CACHE) && ADFILE_OK) { + ad_init(&ad, myvolinfo->v_adouble, myvolinfo->v_ad_options); if (ad_open_metadata( name, adflags, O_RDWR, &ad) != 0) { + + if (dbd_flags & DBD_FLAGS_CLEANUP) + return CNID_INVALID; + dbd_log( LOGSTD, "Error opening AppleDouble file for '%s/%s': %s", cwdbuf, name, strerror(errno)); - return 0; + return CNID_INVALID; } if (dbd_flags & DBD_FLAGS_FORCE) { @@ -421,10 +706,12 @@ static cnid_t check_cnid(const char *name, cnid_t did, struct stat *st, int adfi ad_flush(&ad); } else - ad_cnid = ad_getid(&ad, st->st_dev, st->st_ino, did, stamp); + ad_cnid = ad_getid(&ad, st->st_dev, st->st_ino, did, stamp); if (ad_cnid == 0) - dbd_log( LOGSTD, "Incorrect CNID data in .AppleDouble data for '%s/%s' (bad stamp?)", cwdbuf, name); + dbd_log( LOGSTD, "Bad CNID in adouble file of '%s/%s'", cwdbuf, name); + else + dbd_log( LOGDEBUG, "CNID from .AppleDouble file for '%s/%s': %u", cwdbuf, name, ntohl(ad_cnid)); ad_close_metadata(&ad); } @@ -435,7 +722,8 @@ static cnid_t check_cnid(const char *name, cnid_t did, struct stat *st, int adfi memset(&rqst, 0, sizeof(struct cnid_dbd_rqst)); memset(&rply, 0, sizeof(struct cnid_dbd_rply)); rqst.did = did; - if ( ! (volinfo->v_flags & AFPVOL_NODEV)) + rqst.cnid = ad_cnid; + if ( ! (myvolinfo->v_flags & AFPVOL_NODEV)) rqst.dev = st->st_dev; rqst.ino = st->st_ino; rqst.type = S_ISDIR(st->st_mode)?1:0; @@ -443,8 +731,9 @@ static cnid_t check_cnid(const char *name, cnid_t did, struct stat *st, int adfi rqst.namelen = strlen(name); /* Query the database */ - ret = cmd_dbd_lookup(dbd, &rqst, &rply, (dbd_flags & DBD_FLAGS_SCAN) ? 1 : 0); - dbif_txn_close(dbd, ret); + ret = dbd_lookup(dbd, &rqst, &rply, (dbd_flags & DBD_FLAGS_SCAN) ? 1 : 0); + if (dbif_txn_close(dbd, ret) != 0) + return CNID_INVALID; if (rply.result == CNID_DBD_RES_OK) { db_cnid = rply.cnid; } else if (rply.result == CNID_DBD_RES_NOTFOUND) { @@ -466,25 +755,60 @@ static cnid_t check_cnid(const char *name, cnid_t did, struct stat *st, int adfi if ( ! (dbd_flags & DBD_FLAGS_SCAN)) { rqst.cnid = db_cnid; ret = dbd_delete(dbd, &rqst, &rply, DBIF_CNID); - dbif_txn_close(dbd, ret); + if (dbif_txn_close(dbd, ret) != 0) + return CNID_INVALID; rqst.cnid = ad_cnid; ret = dbd_delete(dbd, &rqst, &rply, DBIF_CNID); - dbif_txn_close(dbd, ret); + if (dbif_txn_close(dbd, ret) != 0) + return CNID_INVALID; ret = dbd_rebuild_add(dbd, &rqst, &rply); - dbif_txn_close(dbd, ret); + if (dbif_txn_close(dbd, ret) != 0) + return CNID_INVALID; } return ad_cnid; } else if (ad_cnid && (db_cnid == 0)) { /* in ad-file but not in db */ if ( ! (dbd_flags & DBD_FLAGS_SCAN)) { - dbd_log( LOGDEBUG, "CNID rebuild add for '%s/%s', adding with CNID from ad-file: %u", cwdbuf, name, ntohl(ad_cnid)); + /* Ensure the cnid from the ad-file is not already occupied by another file */ + dbd_log(LOGDEBUG, "Checking whether CNID %u from ad-file is occupied", + ntohl(ad_cnid)); + + rqst.cnid = ad_cnid; + ret = dbd_resolve(dbd, &rqst, &rply); + if (ret == CNID_DBD_RES_OK) { + /* Occupied! Choose another, update ad-file */ + ret = dbd_add(dbd, &rqst, &rply, 1); + if (dbif_txn_close(dbd, ret) != 0) + return CNID_INVALID; + db_cnid = rply.cnid; + dbd_log(LOGSTD, "New CNID for '%s/%s': %u", cwdbuf, name, ntohl(db_cnid)); + + if ((myvolinfo->v_flags & AFPVOL_CACHE) + && ADFILE_OK + && ( ! (dbd_flags & DBD_FLAGS_SCAN))) { + dbd_log(LOGSTD, "Writing CNID data for '%s/%s' to AppleDouble file", + cwdbuf, name, ntohl(db_cnid)); + ad_init(&ad, myvolinfo->v_adouble, myvolinfo->v_ad_options); + if (ad_open_metadata( name, adflags, O_RDWR, &ad) != 0) { + dbd_log(LOGSTD, "Error opening AppleDouble file for '%s/%s': %s", + cwdbuf, name, strerror(errno)); + return CNID_INVALID; + } + ad_setid( &ad, st->st_dev, st->st_ino, db_cnid, did, stamp); + ad_flush(&ad); + ad_close_metadata(&ad); + } + return db_cnid; + } + + dbd_log(LOGDEBUG, "CNID rebuild add '%s/%s' with CNID from ad-file %u", + cwdbuf, name, ntohl(ad_cnid)); rqst.cnid = ad_cnid; - ret = dbd_delete(dbd, &rqst, &rply, DBIF_CNID); - dbif_txn_close(dbd, ret); ret = dbd_rebuild_add(dbd, &rqst, &rply); - dbif_txn_close(dbd, ret); + if (dbif_txn_close(dbd, ret) != 0) + return CNID_INVALID; } return ad_cnid; } else if ((db_cnid == 0) && (ad_cnid == 0)) { @@ -492,22 +816,25 @@ static cnid_t check_cnid(const char *name, cnid_t did, struct stat *st, int adfi /* Note: the next test will use this new CNID too! */ if ( ! (dbd_flags & DBD_FLAGS_SCAN)) { /* add to db */ - ret = cmd_dbd_add(dbd, &rqst, &rply); - dbif_txn_close(dbd, ret); + ret = dbd_add(dbd, &rqst, &rply, 1); + if (dbif_txn_close(dbd, ret) != 0) + return CNID_INVALID; db_cnid = rply.cnid; - dbd_log( LOGSTD, "New CNID for '%s/%s': %u", cwdbuf, name, ntohl(db_cnid)); + dbd_log(LOGSTD, "New CNID for '%s/%s': %u", cwdbuf, name, ntohl(db_cnid)); } } - + if ((ad_cnid == 0) && db_cnid) { /* in db but zeroID in ad-file, write it to ad-file if AFPVOL_CACHE */ - if ((volinfo->v_flags & AFPVOL_CACHE) && ADFILE_OK) { + if ((myvolinfo->v_flags & AFPVOL_CACHE) && ADFILE_OK) { if ( ! (dbd_flags & DBD_FLAGS_SCAN)) { - dbd_log( LOGSTD, "Writing CNID data for '%s/%s' to AppleDouble file", cwdbuf, name, ntohl(db_cnid)); - ad_init(&ad, volinfo->v_adouble, volinfo->v_ad_options); + dbd_log(LOGSTD, "Writing CNID data for '%s/%s' to AppleDouble file", + cwdbuf, name, ntohl(db_cnid)); + ad_init(&ad, myvolinfo->v_adouble, myvolinfo->v_ad_options); if (ad_open_metadata( name, adflags, O_RDWR, &ad) != 0) { - dbd_log( LOGSTD, "Error opening AppleDouble file for '%s/%s': %s", cwdbuf, name, strerror(errno)); - return 0; + dbd_log(LOGSTD, "Error opening AppleDouble file for '%s/%s': %s", + cwdbuf, name, strerror(errno)); + return CNID_INVALID; } ad_setid( &ad, st->st_dev, st->st_ino, db_cnid, did, stamp); ad_flush(&ad); @@ -517,7 +844,7 @@ static cnid_t check_cnid(const char *name, cnid_t did, struct stat *st, int adfi return db_cnid; } - return 0; + return CNID_INVALID; } /* @@ -529,12 +856,17 @@ static cnid_t check_cnid(const char *name, cnid_t did, struct stat *st, int adfi static int dbd_readdir(int volroot, cnid_t did) { int cwd, ret = 0, adflags, adfile_ok, addir_ok, encoding_ok; - cnid_t cnid; + cnid_t cnid = 0; const char *name; DIR *dp; struct dirent *ep; static struct stat st; /* Save some stack space */ + /* keep trying to get the lock */ + if (!db_locked) + if ((db_locked = get_lock(1, NULL)) == -1) + return -1; + /* Check again for .AppleDouble folder, check_adfile also checks/creates it */ if ((addir_ok = check_addir(volroot)) != 0) if ( ! (dbd_flags & DBD_FLAGS_SCAN)) @@ -569,18 +901,66 @@ static int dbd_readdir(int volroot, cnid_t did) continue; } + /* Check for special folders in volume root e.g. ".zfs" */ + if (volroot) { + if ((name = check_special_dirs(ep->d_name)) != NULL) { + dbd_log(LOGSTD, "Ignoring special dir \"%s\"", name); + continue; + } + } + /* Skip .AppleDouble dir in this loop */ if (STRCMP(ep->d_name, == , ADv2_DIRNAME)) continue; - if ((ret = stat(ep->d_name, &st)) < 0) { - dbd_log( LOGSTD, "Lost file while reading dir '%s/%s', probably removed: %s", cwdbuf, ep->d_name, strerror(errno)); + if ((ret = lstat(ep->d_name, &st)) < 0) { + dbd_log( LOGSTD, "Lost file while reading dir '%s/%s', probably removed: %s", + cwdbuf, ep->d_name, strerror(errno)); continue; } - if (S_ISREG(st.st_mode)) + + switch (st.st_mode & S_IFMT) { + case S_IFREG: adflags = 0; - else + break; + case S_IFDIR: adflags = ADFLAGS_DIR; + break; + case S_IFLNK: + dbd_log(LOGDEBUG, "Ignoring symlink %s/%s", cwdbuf, ep->d_name); +#if 0 + ret = check_symlink(ep->d_name, &adflags); + if (ret == 1) + break; + if (ret == -1) + dbd_log(LOGSTD, "Error checking symlink %s/%s", cwdbuf, ep->d_name); +#endif + continue; + default: + dbd_log(LOGSTD, "Bad filetype: %s/%s", cwdbuf, ep->d_name); + if ( ! (dbd_flags & DBD_FLAGS_SCAN)) { + if ((unlink(ep->d_name)) != 0) { + dbd_log(LOGSTD, "Error removing: %s/%s: %s", cwdbuf, ep->d_name, strerror(errno)); + } + } + continue; + } + + /************************************************************************** + Statistics + **************************************************************************/ + static unsigned long long statcount = 0; + static time_t t = 0; + + if (t == 0) + t = time(NULL); + + statcount++; + if ((statcount % 10000) == 0) { + if (dbd_flags & DBD_FLAGS_STATS) + dbd_log(LOGSTD, "Scanned: %10llu, time: %10llu s", + statcount, (unsigned long long)(time(NULL) - t)); + } /************************************************************************** Tests @@ -603,17 +983,32 @@ static int dbd_readdir(int volroot, cnid_t did) cnid = check_cnid(ep->d_name, did, &st, adfile_ok, adflags); /* Now add this object to our rebuild dbd */ - if (cnid) { + if (cnid && dbd_rebuild) { + static uint count = 0; rqst.cnid = rply.cnid; - dbd_rebuild_add(dbd_rebuild, &rqst, &rply); + ret = dbd_rebuild_add(dbd_rebuild, &rqst, &rply); + if (dbif_txn_close(dbd_rebuild, ret) != 0) + return -1; if (rply.result != CNID_DBD_RES_OK) { - dbd_log( LOGDEBUG, "Fatal error adding CNID: %u for '%s/%s' to in-memory rebuild-db", + dbd_log( LOGSTD, "Fatal error adding CNID: %u for '%s/%s' to in-memory rebuild-db", cnid, cwdbuf, ep->d_name); - exit(EXIT_FAILURE); + return -1; + } + count++; + if (count == 10000) { + if (dbif_txn_checkpoint(dbd_rebuild, 0, 0, 0) < 0) { + dbd_log(LOGSTD, "Error checkpointing!"); + return -1; + } + count = 0; } } } + /* Check EA files */ + if (myvolinfo->v_vfs_ea == AFPVOL_EA_AD) + check_eafiles(ep->d_name); + /************************************************************************** Recursion **************************************************************************/ @@ -637,7 +1032,7 @@ static int dbd_readdir(int volroot, cnid_t did) close(cwd); *(strrchr(cwdbuf, '/')) = 0; if (ret < 0) - continue; + return -1; } } @@ -658,17 +1053,22 @@ static int scanvol(struct volinfo *vi, dbd_flags_t flags) } /* Make this stuff accessible from all funcs easily */ - volinfo = vi; + myvolinfo = vi; dbd_flags = flags; + /* Init a fake struct vol with just enough so we can call ea_open and friends */ + volume.v_adouble = AD_VERSION2; + volume.v_vfs_ea = myvolinfo->v_vfs_ea; + initvol_vfs(&volume); + /* Run with umask 0 */ umask(0); - /* chdir to vol */ - strcpy(cwdbuf, volinfo->v_path); - if (cwdbuf[strlen(cwdbuf) - 1] == '/') - cwdbuf[strlen(cwdbuf) - 1] = 0; - chdir(volinfo->v_path); + /* Remove trailing slash from volume, chdir to vol */ + if (myvolinfo->v_path[strlen(myvolinfo->v_path) - 1] == '/') + myvolinfo->v_path[strlen(myvolinfo->v_path) - 1] = 0; + strcpy(cwdbuf, myvolinfo->v_path); + chdir(myvolinfo->v_path); /* Start recursion */ if (dbd_readdir(1, htonl(2)) < 0) /* 2 = volumeroot CNID */ @@ -677,12 +1077,12 @@ static int scanvol(struct volinfo *vi, dbd_flags_t flags) return 0; } -/* - Remove all CNIDs from dbd that are not in dbd_rebuild +/* + Remove all CNIDs from dbd that are not in dbd_rebuild */ static void delete_orphaned_cnids(DBD *dbd, DBD *dbd_rebuild, dbd_flags_t flags) { - int ret, deleted = 0; + int ret = 0, deleted = 0; cnid_t dbd_cnid = 0, rebuild_cnid = 0; struct cnid_dbd_rqst rqst; struct cnid_dbd_rply rply; @@ -699,8 +1099,11 @@ static void delete_orphaned_cnids(DBD *dbd, DBD *dbd_rebuild, dbd_flags_t flags) /* Start main loop through dbd: get CNID from dbd */ while ((dbif_idwalk(dbd, &dbd_cnid, 0)) == 1) { + /* Check if we got a termination signal */ + if (alarmed) + longjmp(jmp, 1); /* this jumps back to cmd_dbd_scanvol() */ - if (deleted > 50) { + if (deleted > 1000) { deleted = 0; if (dbif_txn_checkpoint(dbd, 0, 0, 0) < 0) { dbd_log(LOGSTD, "Error checkpointing!"); @@ -720,10 +1123,19 @@ static void delete_orphaned_cnids(DBD *dbd, DBD *dbd_rebuild, dbd_flags_t flags) dbd_log(LOGSTD, "Orphaned CNID in database: %u", dbd_cnid); if ( ! (dbd_flags & DBD_FLAGS_SCAN)) { rqst.cnid = htonl(dbd_cnid); - ret = dbd_delete(dbd, &rqst, &rply, DBIF_CNID); - dbif_txn_close(dbd, ret); + if ((ret = dbd_delete(dbd, &rqst, &rply, DBIF_CNID)) == -1) { + dbd_log(LOGSTD, "Error deleting CNID %u", dbd_cnid); + (void)dbif_txn_abort(dbd); + goto cleanup; + } + + if (dbif_txn_close(dbd, ret) != 0) + return; deleted++; } + /* Check if we got a termination signal */ + if (alarmed) + longjmp(jmp, 1); /* this jumps back to cmd_dbd_scanvol() */ } return; } else @@ -733,26 +1145,32 @@ static void delete_orphaned_cnids(DBD *dbd, DBD *dbd_rebuild, dbd_flags_t flags) if (dbd_cnid < rebuild_cnid) { /* CNID is orphaned -> delete */ - dbd_log(LOGSTD, "Orphaned CNID in database: %u.", dbd_cnid); + dbd_log(LOGSTD, "One orphaned CNID in database: %u.", dbd_cnid); if ( ! (dbd_flags & DBD_FLAGS_SCAN)) { rqst.cnid = htonl(dbd_cnid); - ret = dbd_delete(dbd, &rqst, &rply, DBIF_CNID); - dbif_txn_close(dbd, ret); + if ((ret = dbd_delete(dbd, &rqst, &rply, DBIF_CNID)) == -1) { + dbd_log(LOGSTD, "Error deleting CNID %u", dbd_cnid); + (void)dbif_txn_abort(dbd); + goto cleanup; + } + if (dbif_txn_close(dbd, ret) != 0) + return; deleted++; } continue; } if (dbd_cnid > rebuild_cnid) { + dbif_idwalk(dbd, NULL, 1); /* Close cursor */ + dbif_idwalk(dbd_rebuild, NULL, 1); /* Close cursor */ + (void)dbif_txn_close(dbd, 2); + (void)dbif_txn_close(dbd_rebuild, 2); dbd_log(LOGSTD, "Ghost CNID: %u. This is fatal! Dumping rebuild db:\n", rebuild_cnid); dbif_dump(dbd_rebuild, 0); dbd_log(LOGSTD, "Send this dump and a `dbd -d ...` dump to the Netatalk Dev team!"); - dbif_txn_close(dbd, ret); - dbif_idwalk(dbd, NULL, 1); /* Close cursor */ - dbif_idwalk(dbd_rebuild, NULL, 1); /* Close cursor */ goto cleanup; } - } + } /* while ((dbif_idwalk(dbd, &dbd_cnid, 0)) == 1) */ cleanup: dbif_idwalk(dbd, NULL, 1); /* Close cursor */ @@ -760,54 +1178,110 @@ cleanup: return; } +static const char *get_tmpdb_path(void) +{ + pid_t pid = getpid(); + static char path[MAXPATHLEN]; + snprintf(path, MAXPATHLEN, "/tmp/tmpdb-dbd.%u", pid); + if (mkdir(path, 0755) != 0) + return NULL; + return path; +} + /* Main func called from cmd_dbd.c */ -int cmd_dbd_scanvol(DBD *dbd_ref, struct volinfo *volinfo, dbd_flags_t flags) +int cmd_dbd_scanvol(DBD *dbd_ref, struct volinfo *vi, dbd_flags_t flags) { int ret = 0; + struct db_param db_param = { 0 }; + const char *tmpdb_path = NULL; + + /* Set cachesize for in-memory rebuild db */ + db_param.cachesize = 64 * 1024; /* 64 MB */ + db_param.maxlocks = DEFAULT_MAXLOCKS; + db_param.maxlockobjs = DEFAULT_MAXLOCKOBJS; + db_param.logfile_autoremove = 1; /* Make it accessible for all funcs */ dbd = dbd_ref; /* We only support unicode volumes ! */ - if ( volinfo->v_volcharset != CH_UTF8) { - dbd_log( LOGSTD, "Not a Unicode volume: %s, %u != %u", volinfo->v_volcodepage, volinfo->v_volcharset, CH_UTF8); + if ( vi->v_volcharset != CH_UTF8) { + dbd_log( LOGSTD, "Not a Unicode volume: %s, %u != %u", vi->v_volcodepage, vi->v_volcharset, CH_UTF8); return -1; } - if (! nocniddb) { - /* Get volume stamp */ - dbd_getstamp(dbd, &rqst, &rply); - if (rply.result != CNID_DBD_RES_OK) - goto exit_cleanup; - memcpy(stamp, rply.name, CNID_DEV_LEN); - - /* open/create rebuild dbd, copy rootinfo key */ - if (NULL == (dbd_rebuild = dbif_init(NULL, NULL))) - return -1; - if (0 != (dbif_open(dbd_rebuild, NULL, 0))) - return -1; - if (0 != (dbif_copy_rootinfokey(dbd, dbd_rebuild))) - goto exit_cleanup; + /* Get volume stamp */ + dbd_getstamp(dbd, &rqst, &rply); + if (rply.result != CNID_DBD_RES_OK) { + ret = -1; + goto exit; } + memcpy(stamp, rply.name, CNID_DEV_LEN); + + /* temporary rebuild db, used with -re rebuild to delete unused CNIDs, not used with -f */ + if (! nocniddb && (flags & DBD_FLAGS_EXCL) && !(flags & DBD_FLAGS_FORCE)) { + tmpdb_path = get_tmpdb_path(); + if (NULL == (dbd_rebuild = dbif_init(tmpdb_path, "cnid2.db"))) { + ret = -1; + goto exit; + } - if (setjmp(jmp) != 0) - goto exit_cleanup; /* Got signal, jump from dbd_readdir */ + if (dbif_env_open(dbd_rebuild, + &db_param, + DB_CREATE | DB_INIT_LOCK | DB_INIT_LOG | DB_INIT_MPOOL | DB_INIT_TXN) < 0) { + dbd_log(LOGSTD, "error opening tmp database!"); + goto exit; + } + + if (0 != (dbif_open(dbd_rebuild, NULL, 0))) { + ret = -1; + goto exit; + } + + if (0 != (dbif_copy_rootinfokey(dbd, dbd_rebuild))) { + ret = -1; + goto exit; + } + } + + if (setjmp(jmp) != 0) { + ret = 0; /* Got signal, jump from dbd_readdir */ + goto exit; + } /* scanvol */ - if ( (scanvol(volinfo, flags)) != 0) - return -1; + if ( (scanvol(vi, flags)) != 0) { + ret = -1; + goto exit; + } +exit: if (! nocniddb) { - /* We can only do this in exclusive mode, otherwise we might delete CNIDs added from - other clients in between our pass 1 and 2 */ - if (flags & DBD_FLAGS_EXCL) + if (dbif_txn_close(dbd, ret == 0 ? 1 : 0) != 0) + ret = -1; + if (dbd_rebuild) + if (dbif_txn_close(dbd_rebuild, ret == 0 ? 1 : 0) != 0) + ret = -1; + if ((ret == 0) && dbd_rebuild && (flags & DBD_FLAGS_EXCL) && !(flags & DBD_FLAGS_FORCE)) + /* We can only do this in exclusive mode, otherwise we might delete CNIDs added from + other clients in between our pass 1 and 2 */ delete_orphaned_cnids(dbd, dbd_rebuild, flags); } -exit_cleanup: - if (! nocniddb) + if (dbd_rebuild) { + dbd_log(LOGDEBUG, "Closing tmp db"); dbif_close(dbd_rebuild); + + if (tmpdb_path) { + char cmd[8 + MAXPATHLEN]; + snprintf(cmd, 8 + MAXPATHLEN, "rm -f %s/*", tmpdb_path); + dbd_log( LOGDEBUG, "Removing temp database '%s'", tmpdb_path); + system(cmd); + snprintf(cmd, 8 + MAXPATHLEN, "rmdir %s", tmpdb_path); + system(cmd); + } + } return ret; }