From cea39693ccd6467a9eb83f38a1602ee2b3fbdaee Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Tue, 18 Jan 2005 10:49:45 +0000 Subject: [PATCH] More verbose log if HTTP file access fails --- src/yaz-proxy.cpp | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/yaz-proxy.cpp b/src/yaz-proxy.cpp index 1c655b5..2b1afbe 100644 --- a/src/yaz-proxy.cpp +++ b/src/yaz-proxy.cpp @@ -1,4 +1,4 @@ -/* $Id: yaz-proxy.cpp,v 1.17 2005-01-11 20:58:04 adam Exp $ +/* $Id: yaz-proxy.cpp,v 1.18 2005-01-18 10:49:45 adam Exp $ Copyright (c) 1998-2005, Index Data. This file is part of the yaz-proxy. @@ -1895,26 +1895,35 @@ int Yaz_Proxy::file_access(Z_HTTP_Request *hreq) struct stat sbuf; if (hreq->path[0] != '/') { - yaz_log(YLOG_WARN, "Path != /"); + yaz_log(YLOG_WARN, "Bad path: %s", hreq->path); return 0; } const char *cp = hreq->path; while (*cp) { if (*cp == '/' && strchr("/.", cp[1])) + { + yaz_log(YLOG_WARN, "Bad path: %s", hreq->path); return 0; + } cp++; } const char *fname = hreq->path+1; if (stat(fname, &sbuf)) { - yaz_log(YLOG_WARN, "stat %s failed", fname); + yaz_log(YLOG_WARN|YLOG_ERRNO, "%s: stat failed", fname); return 0; } if ((sbuf.st_mode & S_IFMT) != S_IFREG) + { + yaz_log(YLOG_WARN, "%s: not a regular file", fname); return 0; + } if (sbuf.st_size > (off_t) 1000000) + { + yaz_log(YLOG_WARN, "%s: too large for transfer", fname); return 0; + } ODR o = odr_encode(); Yaz_ProxyConfig *cfg = check_reconfigure(); -- 1.7.10.4