X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=etc%2Fafpd%2Fcatsearch.c;h=d3dfc7d4ef7ff87611b0735133c9b07dcb56d703;hb=84c3a8f52deced7429f9d72276232ee282b3b823;hp=70c93f15207a1ff7d48e2fdeb93fd91ba8a89947;hpb=c27da5ec4487778eb8c60cd52d480a97b099cbdc;p=netatalk.git diff --git a/etc/afpd/catsearch.c b/etc/afpd/catsearch.c index 70c93f15..d3dfc7d4 100644 --- a/etc/afpd/catsearch.c +++ b/etc/afpd/catsearch.c @@ -1,6 +1,7 @@ /* * Netatalk 2002 (c) * Copyright (C) 1990, 1993 Regents of The University of Michigan + * Copyright (C) 2010 Frank Lahm * All Rights Reserved. See COPYRIGHT */ @@ -18,6 +19,10 @@ * * Initial version written by Rafal Lewczuk * + * Starting with Netatalk 2.2 searching by name criteria utilizes the + * CNID database in conjunction with an enhanced cnid_dbd. This requires + * the use of cnidscheme:dbd for the searched volume, the new functionality + * is not built into cnidscheme:cdb. */ #ifdef HAVE_CONFIG_H @@ -30,44 +35,35 @@ #include #include #include - -#if STDC_HEADERS #include -#else -#ifndef HAVE_MEMCPY -#define memcpy(d,s,n) bcopy ((s), (d), (n)) -#define memmove(d,s,n) bcopy ((s), (d), (n)) -#endif /* ! HAVE_MEMCPY */ -#endif - #include #include #include #include #include -#ifdef CNID_DB #include -#endif /* CNID_DB */ - +#include #include #include +#include +#include +#include #include "desktop.h" #include "directory.h" #include "dircache.h" #include "file.h" #include "volume.h" -#include "globals.h" #include "filedir.h" #include "fork.h" struct finderinfo { - u_int32_t f_type; - u_int32_t creator; - u_int16_t attrs; /* File attributes (high 8 bits)*/ - u_int16_t label; /* Label (low 8 bits )*/ + uint32_t f_type; + uint32_t creator; + uint16_t attrs; /* File attributes (high 8 bits)*/ + uint16_t label; /* Label (low 8 bits )*/ char reserved[22]; /* Unknown (at least for now...) */ }; @@ -91,14 +87,14 @@ typedef char packed_finder[ADEDLEN_FINDERI]; /* This is our search-criteria structure. */ struct scrit { - u_int32_t rbitmap; /* Request bitmap - which values should we check ? */ - u_int16_t fbitmap, dbitmap; /* file & directory bitmap - which values should we return ? */ - u_int16_t attr; /* File attributes */ + uint32_t rbitmap; /* Request bitmap - which values should we check ? */ + uint16_t fbitmap, dbitmap; /* file & directory bitmap - which values should we return ? */ + uint16_t attr; /* File attributes */ time_t cdate; /* Creation date */ time_t mdate; /* Last modification date */ time_t bdate; /* Last backup date */ - u_int32_t pdid; /* Parent DID */ - u_int16_t offcnt; /* Offspring count */ + uint32_t pdid; /* Parent DID */ + uint16_t offcnt; /* Offspring count */ struct finderinfo finfo; /* Finder info */ char lname[64]; /* Long name */ char utf8name[514]; /* UTF8 or UCS2 name */ /* for convert_charset dest_len parameter +2 */ @@ -113,7 +109,8 @@ struct scrit { * */ struct dsitem { - struct dir *dir; /* Structure describing this directory */ +// struct dir *dir; /* Structure describing this directory */ +// cnid_t did; /* CNID of this directory */ int pidx; /* Parent's dsitem structure index. */ int checked; /* Have we checked this directory ? */ int path_len; @@ -146,8 +143,7 @@ static int addstack(char *uname, struct dir *dir, int pidx) /* Put new element. Allocate and copy lname and path. */ ds = dstack + dsidx++; - ds->dir = dir; - dir->d_flags |= DIRF_CACHELOCK; +// ds->did = dir->d_did; ds->pidx = pidx; ds->checked = 0; if (pidx >= 0) { @@ -180,7 +176,6 @@ static int reducestack(void) while (dsidx > 0) { if (dstack[dsidx-1].checked) { dsidx--; - dstack[dsidx].dir->d_flags &= ~DIRF_CACHELOCK; free(dstack[dsidx].path); } else return dsidx - 1; @@ -194,7 +189,6 @@ static void clearstack(void) save_cidx = -1; while (dsidx > 0) { dsidx--; - dstack[dsidx].dir->d_flags &= ~DIRF_CACHELOCK; free(dstack[dsidx].path); } } @@ -217,7 +211,7 @@ static struct adouble *adl_lkup(struct vol *vol, struct path *path, struct adoub if (!isdir && (of = of_findname(path))) { adp = of->of_ad; } else { - ad_init(&ad, vol->v_adouble, vol->v_ad_options); + ad_init(&ad, vol); adp = &ad; } @@ -264,11 +258,11 @@ unpack_finderinfo(struct vol *vol, struct path *path, struct adouble **adp, stru */ static int crit_check(struct vol *vol, struct path *path) { int result = 0; - u_int16_t attr, flags = CONV_PRECOMPOSE; + uint16_t attr, flags = CONV_PRECOMPOSE; struct finderinfo *finfo = NULL, finderinfo; struct adouble *adp = NULL; time_t c_date, b_date; - u_int32_t ac_date, ab_date; + uint32_t ac_date, ab_date; static char convbuf[514]; /* for convert_charset dest_len parameter +2 */ size_t len; int islnk; @@ -287,7 +281,7 @@ static int crit_check(struct vol *vol, struct path *path) { * An other option would be to call get_id in utompath but * we need to pass parent dir */ - if (!(path->m_name = utompath(vol, path->u_name, 0 , utf8_encoding()) )) { + if (!(path->m_name = utompath(vol, path->u_name, 0 , utf8_encoding(vol->v_obj)) )) { /*retry with the right id */ cnid_t id; @@ -300,7 +294,7 @@ static int crit_check(struct vol *vol, struct path *path) { } /* save the id for getfilparm */ path->id = id; - if (!(path->m_name = utompath(vol, path->u_name, id , utf8_encoding()))) { + if (!(path->m_name = utompath(vol, path->u_name, id , utf8_encoding(vol->v_obj)))) { return 0; } } @@ -425,18 +419,18 @@ static int crit_check(struct vol *vol, struct path *path) { result |= 1; crit_check_ret: if (adp != NULL) - ad_close_metadata(adp); + ad_close(adp, ADFLAGS_HF); return result; } /* ------------------------------ */ -static int rslt_add ( struct vol *vol, struct path *path, char **buf, int ext) +static int rslt_add (const AFPObj *obj, struct vol *vol, struct path *path, char **buf, int ext) { char *p = *buf; int ret; size_t tbuf =0; - u_int16_t resultsize; + uint16_t resultsize; int isdir = S_ISDIR(path->st.st_mode); /* Skip resultsize */ @@ -453,11 +447,11 @@ static int rslt_add ( struct vol *vol, struct path *path, char **buf, int ext) } if ( isdir ) { - ret = getdirparams(vol, c1.dbitmap, path, path->d_dir, p , &tbuf ); + ret = getdirparams(obj, vol, c1.dbitmap, path, path->d_dir, p , &tbuf ); } else { /* FIXME slow if we need the file ID, we already know it, done ? */ - ret = getfilparams ( vol, c1.fbitmap, path, path->d_dir, p, &tbuf); + ret = getfilparams (obj, vol, c1.fbitmap, path, path->d_dir, p, &tbuf); } if ( ret != AFP_OK ) @@ -485,21 +479,34 @@ static int rslt_add ( struct vol *vol, struct path *path, char **buf, int ext) #define VETO_STR \ "./../.AppleDouble/.AppleDB/Network Trash Folder/TheVolumeSettingsFolder/TheFindByContentFolder/.AppleDesktop/.Parent/" -/* This function performs search. It is called directly from afp_catsearch - * vol - volume we are searching on ... - * dir - directory we are starting from ... - * c1, c2 - search criteria - * rmatches - maximum number of matches we can return - * pos - position we've stopped recently - * rbuf - output buffer - * rbuflen - output buffer length +/*! + * This function performs a filesystem search + * + * Uses globals c1, c2, the search criteria + * + * @param vol (r) volume we are searching on ... + * @param dir (rw) directory we are starting from ... + * @param rmatches (r) maximum number of matches we can return + * @param pos (r) position we've stopped recently + * @param rbuf (w) output buffer + * @param nrecs (w) number of matches + * @param rsize (w) length of data written to output buffer + * @param ext (r) extended search flag */ #define NUM_ROUNDS 200 -static int catsearch(struct vol *vol, struct dir *dir, - int rmatches, u_int32_t *pos, char *rbuf, u_int32_t *nrecs, int *rsize, int ext) +static int catsearch(const AFPObj *obj, + struct vol *vol, + struct dir *dir, + int rmatches, + uint32_t *pos, + char *rbuf, + uint32_t *nrecs, + int *rsize, + int ext) { - static u_int32_t cur_pos; /* Saved position index (ID) - used to remember "position" across FPCatSearch calls */ + static uint32_t cur_pos; /* Saved position index (ID) - used to remember "position" across FPCatSearch calls */ static DIR *dirpos; /* UNIX structure describing currently opened directory. */ + struct dir *currentdir; /* struct dir of current directory */ int cidx, r; struct dirent *entry; int result = AFP_OK; @@ -545,6 +552,8 @@ static int catsearch(struct vol *vol, struct dir *dir, start_time = time(NULL); while ((cidx = reducestack()) != -1) { + LOG(log_debug, logtype_afpd, "catsearch: dir: \"%s\"", dstack[cidx].path); + error = lchdir(dstack[cidx].path); if (!error && dirpos == NULL) @@ -570,13 +579,22 @@ static int catsearch(struct vol *vol, struct dir *dir, } /* switch (errno) */ goto catsearch_end; } + + if ((currentdir = dirlookup_bypath(vol, dstack[cidx].path)) == NULL) { + result = AFPERR_MISC; + goto catsearch_end; + } + LOG(log_debug, logtype_afpd, "catsearch: current struct dir: \"%s\"", cfrombstr(currentdir->d_fullpath)); - while ((entry=readdir(dirpos)) != NULL) { + while ((entry = readdir(dirpos)) != NULL) { (*pos)++; if (!check_dirent(vol, entry->d_name)) continue; + LOG(log_debug, logtype_afpd, "catsearch(\"%s\"): dirent: \"%s\"", + cfrombstr(currentdir->d_fullpath), entry->d_name); + memset(&path, 0, sizeof(path)); path.u_name = entry->d_name; if (of_stat(&path) != 0) { @@ -600,10 +618,16 @@ static int catsearch(struct vol *vol, struct dir *dir, ALL dirsearch_byname will fail. */ int unlen = strlen(path.u_name); - path.d_dir = dircache_search_by_name(vol, dstack[cidx].dir, path.u_name, unlen, path.st.st_ctime); + path.d_dir = dircache_search_by_name(vol, + currentdir, + path.u_name, + unlen); if (path.d_dir == NULL) { /* path.m_name is set by adddir */ - if (NULL == (path.d_dir = dir_add( vol, dstack[cidx].dir, &path, unlen) ) ) { + if ((path.d_dir = dir_add(vol, + currentdir, + &path, + unlen)) == NULL) { result = AFPERR_MISC; goto catsearch_end; } @@ -614,16 +638,15 @@ static int catsearch(struct vol *vol, struct dir *dir, result = AFPERR_MISC; goto catsearch_end; } + } else { + path.d_dir = currentdir; } - else { - /* yes it sucks for directory d_dir is the directory, for file it's the parent directory*/ - path.d_dir = dstack[cidx].dir; - } + ccr = crit_check(vol, &path); /* bit 0 means that criteria has been met */ if ((ccr & 1)) { - r = rslt_add ( vol, &path, &rrbuf, ext); + r = rslt_add (obj, vol, &path, &rrbuf, ext); if (r == 0) { result = AFPERR_MISC; @@ -670,23 +693,175 @@ catsearch_end: /* Exiting catsearch: error condition */ return result; } /* catsearch() */ +/*! + * This function performs a CNID db search + * + * Uses globals c1, c2, the search criteria + * + * @param vol (r) volume we are searching on ... + * @param dir (rw) directory we are starting from ... + * @param uname (r) UNIX name of object to search + * @param rmatches (r) maximum number of matches we can return + * @param pos (r) position we've stopped recently + * @param rbuf (w) output buffer + * @param nrecs (w) number of matches + * @param rsize (w) length of data written to output buffer + * @param ext (r) extended search flag + */ +static int catsearch_db(const AFPObj *obj, + struct vol *vol, + struct dir *dir, + const char *uname, + int rmatches, + uint32_t *pos, + char *rbuf, + uint32_t *nrecs, + int *rsize, + int ext) +{ + static char resbuf[DBD_MAX_SRCH_RSLTS * sizeof(cnid_t)]; + static uint32_t cur_pos; + static int num_matches; + int ccr ,r; + int result = AFP_OK; + struct path path; + char *rrbuf = rbuf; + char buffer[MAXPATHLEN +2]; + uint16_t flags = CONV_TOLOWER; + + LOG(log_debug, logtype_afpd, "catsearch_db(req pos: %u): {pos: %u, name: %s}", + *pos, cur_pos, uname); + + if (*pos != 0 && *pos != cur_pos) { + result = AFPERR_CATCHNG; + goto catsearch_end; + } + + if (cur_pos == 0 || *pos == 0) { + if (convert_charset(vol->v_volcharset, + vol->v_volcharset, + vol->v_maccharset, + uname, + strlen(uname), + buffer, + MAXPATHLEN, + &flags) == (size_t)-1) { + LOG(log_error, logtype_afpd, "catsearch_db: conversion error"); + result = AFPERR_MISC; + goto catsearch_end; + } + + LOG(log_debug, logtype_afpd, "catsearch_db: %s", buffer); + + if ((num_matches = cnid_find(vol->v_cdb, + buffer, + strlen(uname), + resbuf, + sizeof(resbuf))) == -1) { + result = AFPERR_MISC; + goto catsearch_end; + } + } + + while (cur_pos < num_matches) { + char *name; + cnid_t cnid, did; + char resolvebuf[12 + MAXPATHLEN + 1]; + struct dir *dir; + + /* Next CNID to process from buffer */ + memcpy(&cnid, resbuf + cur_pos * sizeof(cnid_t), sizeof(cnid_t)); + did = cnid; + + if ((name = cnid_resolve(vol->v_cdb, &did, resolvebuf, 12 + MAXPATHLEN + 1)) == NULL) + goto next; + LOG(log_debug, logtype_afpd, "catsearch_db: {pos: %u, name:%s, cnid: %u}", + cur_pos, name, ntohl(cnid)); + if ((dir = dirlookup(vol, did)) == NULL) + goto next; + if (movecwd(vol, dir) < 0 ) + goto next; + + memset(&path, 0, sizeof(path)); + path.u_name = name; + path.m_name = utompath(vol, name, cnid, utf8_encoding(vol->v_obj)); + + if (of_stat(&path) != 0) { + switch (errno) { + case EACCES: + case ELOOP: + goto next; + case ENOENT: + + default: + result = AFPERR_MISC; + goto catsearch_end; + } + } + /* For files path.d_dir is the parent dir, for dirs its the dir itself */ + if (S_ISDIR(path.st.st_mode)) + if ((dir = dirlookup(vol, cnid)) == NULL) + goto next; + path.d_dir = dir; + + LOG(log_maxdebug, logtype_afpd,"catsearch_db: dir: %s, cwd: %s, name: %s", + cfrombstr(dir->d_fullpath), getcwdpath(), path.u_name); + + /* At last we can check the search criteria */ + ccr = crit_check(vol, &path); + if ((ccr & 1)) { + LOG(log_debug, logtype_afpd,"catsearch_db: match: %s/%s", + getcwdpath(), path.u_name); + /* bit 1 means that criteria has been met */ + r = rslt_add(obj, vol, &path, &rrbuf, ext); + if (r == 0) { + result = AFPERR_MISC; + goto catsearch_end; + } + *nrecs += r; + /* Number of matches limit */ + if (--rmatches == 0) + goto catsearch_pause; + /* Block size limit */ + if (rrbuf - rbuf >= 448) + goto catsearch_pause; + } + next: + cur_pos++; + } /* while */ + + /* finished */ + result = AFPERR_EOF; + cur_pos = 0; + goto catsearch_end; + +catsearch_pause: + *pos = cur_pos; + +catsearch_end: /* Exiting catsearch: error condition */ + *rsize = rrbuf - rbuf; + LOG(log_debug, logtype_afpd, "catsearch_db(req pos: %u): {pos: %u}", *pos, cur_pos); + return result; +} + /* -------------------------- */ static int catsearch_afp(AFPObj *obj _U_, char *ibuf, size_t ibuflen, char *rbuf, size_t *rbuflen, int ext) { struct vol *vol; - u_int16_t vid; - u_int16_t spec_len; - u_int32_t rmatches, reserved; - u_int32_t catpos[4]; - u_int32_t pdid = 0; + uint16_t vid; + uint16_t spec_len; + uint32_t rmatches, reserved; + uint32_t catpos[4]; + uint32_t pdid = 0; int ret, rsize; - u_int32_t nrecs = 0; + uint32_t nrecs = 0; unsigned char *spec1, *spec2, *bspec1, *bspec2; size_t len; - u_int16_t namelen; - u_int16_t flags; - char tmppath[256]; + uint16_t namelen; + uint16_t flags; + char tmppath[256]; + char *uname; *rbuflen = 0; @@ -857,11 +1032,13 @@ static int catsearch_afp(AFPObj *obj _U_, char *ibuf, size_t ibuflen, /* length */ memcpy(&namelen, spec1, sizeof(namelen)); namelen = ntohs (namelen); - if (namelen > 255) /* Safeguard */ - namelen = 255; + if (namelen > UTF8FILELEN_EARLY) /* Safeguard */ + namelen = UTF8FILELEN_EARLY; memcpy (c1.utf8name, spec1+2, namelen); - c1.utf8name[(namelen+1)] =0; + c1.utf8name[namelen] = 0; + if ((uname = mtoupath(vol, c1.utf8name, 0, utf8_encoding(obj))) == NULL) + return AFPERR_PARAM; /* convert charset */ flags = CONV_PRECOMPOSE; @@ -872,7 +1049,15 @@ static int catsearch_afp(AFPObj *obj _U_, char *ibuf, size_t ibuflen, /* Call search */ *rbuflen = 24; - ret = catsearch(vol, vol->v_root, rmatches, &catpos[0], rbuf+24, &nrecs, &rsize, ext); + if ((c1.rbitmap & (1 << FILPBIT_PDINFO)) + && (strcmp(vol->v_cnidscheme, "dbd") == 0) + && (vol->v_flags & AFPVOL_SEARCHDB)) + /* we've got a name and it's a dbd volume, so search CNID database */ + ret = catsearch_db(obj, vol, vol->v_root, uname, rmatches, &catpos[0], rbuf+24, &nrecs, &rsize, ext); + else + /* perform a slow filesystem tree search */ + ret = catsearch(obj, vol, vol->v_root, rmatches, &catpos[0], rbuf+24, &nrecs, &rsize, ext); + memcpy(rbuf, catpos, sizeof(catpos)); rbuf += sizeof(catpos);