mirror/ULib
1
0
Fork 0
mirror of https://github.com/stefanocasazza/ULib.git synced 2025-09-28 19:05:55 +08:00
Code Issues Releases Wiki Activity

fix

Browse Source
This commit is contained in:
stefanocasazza 2017-08-30 18:02:59 +02:00
parent d9dcc2ec13
commit b6d38a2f05
17 changed files with 407 additions and 321 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/ulib/base/base.h
View File

@ -296,6 +296,7 @@ extern U_EXPORT bool u_exec_failed;
extern U_EXPORT char u_user_name[32]; extern U_EXPORT char u_user_name[32];
extern U_EXPORT uint32_t u_flag_sse; /* detect SSE2, SSSE3, SSE4.2 */ extern U_EXPORT uint32_t u_flag_sse; /* detect SSE2, SSSE3, SSE4.2 */
extern U_EXPORT uint32_t u_m_w, u_m_z; extern U_EXPORT uint32_t u_m_w, u_m_z;
extern U_EXPORT const char* u_trace_folder;
extern U_EXPORT const char* u_short_units[6]; /* { "B", "KB", "MB", "GB", "TB", 0 } */ extern U_EXPORT const char* u_short_units[6]; /* { "B", "KB", "MB", "GB", "TB", 0 } */
extern U_EXPORT const char* restrict u_tmpdir; extern U_EXPORT const char* restrict u_tmpdir;
extern U_EXPORT char u_hostname[HOST_NAME_MAX+1]; extern U_EXPORT char u_hostname[HOST_NAME_MAX+1];

2
include/ulib/base/trace.h
View File

@ -28,9 +28,9 @@ extern "C" {
extern U_EXPORT int u_trace_fd; extern U_EXPORT int u_trace_fd;
extern U_EXPORT int u_trace_signal; extern U_EXPORT int u_trace_signal;
extern U_EXPORT int u_trace_suspend; /* on-off */ extern U_EXPORT int u_trace_suspend; /* on-off */
extern U_EXPORT uint32_t u_trace_num_tab;
extern U_EXPORT char u_trace_tab[256]; /* 256 max indent */ extern U_EXPORT char u_trace_tab[256]; /* 256 max indent */
extern U_EXPORT void* u_trace_mask_level; extern U_EXPORT void* u_trace_mask_level;
extern U_EXPORT uint32_t u_trace_num_tab;
U_EXPORT void u_trace_lock(void); U_EXPORT void u_trace_lock(void);
U_EXPORT void u_trace_close(void); U_EXPORT void u_trace_close(void);

9
include/ulib/container/construct.h
View File

@ -96,13 +96,10 @@ template <> inline void u_destroy(const UStringRep* rep)
#endif #endif
} }
template <> inline void u_destroy(const UStringRep** rep, uint32_t n) template <> inline void u_destroy(const UStringRep** prep, uint32_t n)
{ {
U_TRACE(0, "u_destroy<UStringRep*>(%p,%u)", rep, n) U_TRACE(0, "u_destroy<UStringRep*>(%p,%u)", prep, n)
// coverity[RESOURCE_LEAK] for (uint32_t i = 0; i < n; ++i) ((UStringRep*)prep[i])->release();
#ifndef U_COVERITY_FALSE_POSITIVE
for (uint32_t i = 0; i < n; ++i) ((UStringRep*)rep[i])->release();
#endif
} }
#endif #endif

4
include/ulib/debug/macro.h
View File

@ -121,8 +121,8 @@ if (envp) \
// Dump attributes // Dump attributes
# define U_DUMP_ATTRS(attrs) { uint32_t _i; for (_i = 0; attrs[_i]; ++_i) { U_INTERNAL_DUMP("attrs[%2u] = %S", _i, attrs[_i]) } } # define U_DUMP_ATTRS(attrs) { uint32_t _i; for (_i = 0; (attrs)[_i]; ++_i) { U_INTERNAL_DUMP("attrs[%2u] = %S", _i, (attrs)[_i]) } }
# define U_DUMP_IOVEC(iov,cnt) { int _i; for (_i = 0; _i < cnt; ++_i) { U_INTERNAL_DUMP("iov[%2u](%u) = %.*S", _i, iov[_i].iov_len, iov[_i].iov_len, iov[_i].iov_base) } } # define U_DUMP_IOVEC(iov,cnt) { int _i; for (_i = 0; _i < cnt; ++_i) { U_INTERNAL_DUMP("iov[%2u](%u) = %.*S", _i, (iov)[_i].iov_len, (iov)[_i].iov_len, (iov)[_i].iov_base) } }
#ifdef _MSWINDOWS_ #ifdef _MSWINDOWS_
# define U_FORK() -1 # define U_FORK() -1

13
include/ulib/utility/uhttp.h
View File

@ -1302,16 +1302,12 @@ private:
U_INTERNAL_ASSERT_POINTER(file) U_INTERNAL_ASSERT_POINTER(file)
U_ASSERT_EQUALS(UClientImage_Base::isRequestNotFound(), false) U_ASSERT_EQUALS(UClientImage_Base::isRequestNotFound(), false)
mime_index = U_unknow; uri_suffix = u_getsuffix(U_FILE_TO_PARAM(*file));
U_INTERNAL_DUMP("uri_suffix = %p", uri_suffix) U_INTERNAL_DUMP("uri_suffix = %p", uri_suffix)
if (uri_suffix) if (uri_suffix == U_NULLPTR) mime_index = U_unknow;
{ else (void) u_get_mimetype(uri_suffix+1, &mime_index);
U_INTERNAL_ASSERT_EQUALS(uri_suffix, u_getsuffix(U_FILE_TO_PARAM(*file))+1)
(void) u_get_mimetype(uri_suffix, &mime_index);
}
} }
static const char* setMimeIndex(const char* suffix) static const char* setMimeIndex(const char* suffix)
@ -1402,7 +1398,7 @@ private:
static bool readBodyRequest() U_NO_EXPORT; static bool readBodyRequest() U_NO_EXPORT;
static bool processFileCache() U_NO_EXPORT; static bool processFileCache() U_NO_EXPORT;
static bool readHeaderRequest() U_NO_EXPORT; static bool readHeaderRequest() U_NO_EXPORT;
static void processGetRequest() U_NO_EXPORT; static bool processGetRequest() U_NO_EXPORT;
static bool processAuthorization() U_NO_EXPORT; static bool processAuthorization() U_NO_EXPORT;
static bool checkRequestForHeader() U_NO_EXPORT; static bool checkRequestForHeader() U_NO_EXPORT;
static bool checkGetRequestIfRange() U_NO_EXPORT; static bool checkGetRequestIfRange() U_NO_EXPORT;
@ -1420,6 +1416,7 @@ private:
static void setResponseForRange(uint32_t start, uint32_t end, uint32_t header) U_NO_EXPORT; static void setResponseForRange(uint32_t start, uint32_t end, uint32_t header) U_NO_EXPORT;
static bool checkDataSession(const UString& token, time_t expire, UString* data) U_NO_EXPORT; static bool checkDataSession(const UString& token, time_t expire, UString* data) U_NO_EXPORT;
static inline void resetFileCache() U_NO_EXPORT;
static inline void setUpgrade(const char* ptr) U_NO_EXPORT; static inline void setUpgrade(const char* ptr) U_NO_EXPORT;
static inline bool checkPathName(uint32_t len) U_NO_EXPORT; static inline bool checkPathName(uint32_t len) U_NO_EXPORT;
static inline void setIfModSince(const char* ptr) U_NO_EXPORT; static inline void setIfModSince(const char* ptr) U_NO_EXPORT;

1
src/ulib/base/base.c
View File

@ -161,6 +161,7 @@ bool u_fork_called;
bool u_exec_failed; bool u_exec_failed;
uint32_t u_flag_sse; /* detect SSE2, SSSE3, SSE4.2 */ uint32_t u_flag_sse; /* detect SSE2, SSSE3, SSE4.2 */
char u_user_name[32]; char u_user_name[32];
const char* u_trace_folder;
char u_hostname[HOST_NAME_MAX+1]; char u_hostname[HOST_NAME_MAX+1];
int32_t u_printf_string_max_length; int32_t u_printf_string_max_length;
uint32_t u_hostname_len, u_user_name_len; uint32_t u_hostname_len, u_user_name_len;

24
src/ulib/base/base_trace.c
View File

@ -21,8 +21,8 @@
int u_trace_fd = -1; int u_trace_fd = -1;
int u_trace_signal; int u_trace_signal;
int u_trace_suspend; int u_trace_suspend;
void* u_trace_mask_level;
char u_trace_tab[256]; /* 256 max indent */ char u_trace_tab[256]; /* 256 max indent */
void* u_trace_mask_level;
uint32_t u_trace_num_tab; uint32_t u_trace_num_tab;
static int level_active; static int level_active;
@ -238,6 +238,20 @@ void u_trace_init(int bsignal)
env = getenv(bsignal ? "UTRACE_SIGNAL" : "UTRACE"); env = getenv(bsignal ? "UTRACE_SIGNAL" : "UTRACE");
if (u_trace_folder == U_NULLPTR)
{
u_trace_folder = getenv("UTRACE_FOLDER");
if (u_trace_folder == U_NULLPTR)
{
# if !defined(U_SERVER_CAPTIVE_PORTAL) || defined(ENABLE_THREAD)
u_trace_folder = ".";
# else
u_trace_folder = "/tmp";
# endif
}
}
if (bsignal == 0 && if (bsignal == 0 &&
( env == 0 || ( env == 0 ||
*env == '\0')) *env == '\0'))
@ -280,9 +294,11 @@ void u_trace_init(int bsignal)
if (u_trace_fd == STDERR_FILENO) file_size = 0; if (u_trace_fd == STDERR_FILENO) file_size = 0;
else else
{ {
char name[128]; char name[U_PATH_MAX];
(void) u__snprintf(name, 128, U_CONSTANT_TO_PARAM("trace.%N.%P"), 0); U_INTERNAL_ASSERT_POINTER(u_trace_folder)
(void) u__snprintf(name, sizeof(name), U_CONSTANT_TO_PARAM("%s/trace.%N.%P"), u_trace_folder);
/* NB: O_RDWR is needed for mmap(MAP_SHARED)... */ /* NB: O_RDWR is needed for mmap(MAP_SHARED)... */
@ -290,7 +306,7 @@ void u_trace_init(int bsignal)
if (u_trace_fd == -1) if (u_trace_fd == -1)
{ {
U_WARNING("Failed to create file %S - current working directory: %.*s", name, u_cwd_len, u_cwd); U_WARNING("Failed to create file %S - current working directory: %.*S - UTRACE_FOLDER: %S", name, u_cwd_len, u_cwd, u_trace_folder);
return; return;
} }

2
src/ulib/base/utility.c
View File

@ -2304,7 +2304,7 @@ static const char* u_check_for_suffix_exe(const char* restrict program)
bool u_pathfind(char* restrict result, const char* restrict path, uint32_t path_len, const char* restrict filename, int mode) bool u_pathfind(char* restrict result, const char* restrict path, uint32_t path_len, const char* restrict filename, int mode)
{ {
uint32_t p_index = 0; uint32_t p_index = 0;
char zPath[U_PATH_MAX + 1]; char zPath[U_PATH_MAX+1];
U_INTERNAL_TRACE("u_pathfind(%p,%.*s,%u,%s,%d)", result, path_len, path, path_len, filename, mode) U_INTERNAL_TRACE("u_pathfind(%p,%.*s,%u,%s,%d)", result, path_len, path, path_len, filename, mode)

4
src/ulib/debug/debug_common.cpp
View File

@ -78,7 +78,9 @@ extern "C" void U_EXPORT u_debug_at_exit(void)
u_trace_close(); u_trace_close();
U_WRITE_MEM_POOL_INFO_TO("mempool.%N.%P", 0); U_INTERNAL_ASSERT_POINTER(u_trace_folder)
U_WRITE_MEM_POOL_INFO_TO("%s/mempool.%N.%P", u_trace_folder);
U_INTERNAL_PRINT("u_flag_exit = %d", u_flag_exit) U_INTERNAL_PRINT("u_flag_exit = %d", u_flag_exit)

9
src/ulib/internal/error.cpp
View File

@ -94,13 +94,10 @@ void UError::stackDump()
{ {
U_INTERNAL_TRACE("UError::stackDump()") U_INTERNAL_TRACE("UError::stackDump()")
char name[128]; U_INTERNAL_ASSERT_POINTER(u_trace_folder)
#if defined(U_LINUX) && (!defined(U_SERVER_CAPTIVE_PORTAL) || defined(ENABLE_THREAD)) char name[U_PATH_MAX];
(void) u__snprintf(name, sizeof(name), U_CONSTANT_TO_PARAM("stack.%N.%P"), 0); (void) u__snprintf(name, sizeof(name), U_CONSTANT_TO_PARAM("%s/stack.%N.%P"), u_trace_folder);
#else
(void) u__snprintf(name, sizeof(name), U_CONSTANT_TO_PARAM("/tmp/stack.%N.%P"), 0);
#endif
int fd = open(name, O_CREAT | O_WRONLY | O_APPEND | O_BINARY, 0666); int fd = open(name, O_CREAT | O_WRONLY | O_APPEND | O_BINARY, 0666);

121
src/ulib/net/server/client_image.cpp
View File

@ -1139,6 +1139,11 @@ int UClientImage_Base::handlerRead() // Connection-wide hooks
int result; int result;
uint32_t sz; uint32_t sz;
const char* ptr1;
/*
const char* ptr2;
UHTTP::UServletPage* usp;
*/
prepareForRead(); prepareForRead();
@ -1164,11 +1169,11 @@ start:
} }
#ifdef DEBUG #ifdef DEBUG
U_INTERNAL_ASSERT(socket->isOpen())
UServer_Base::nread++; UServer_Base::nread++;
#endif #endif
U_INTERNAL_ASSERT(socket->isOpen())
loop: loop:
U_INTERNAL_DUMP("U_ClientImage_pipeline = %b size_request = %u rstart = %u rbuffer(%u) = %V", U_INTERNAL_DUMP("U_ClientImage_pipeline = %b size_request = %u rstart = %u rbuffer(%u) = %V",
U_ClientImage_pipeline, size_request, rstart, rbuffer->size(), rbuffer->rep) U_ClientImage_pipeline, size_request, rstart, rbuffer->size(), rbuffer->rep)
@ -1254,7 +1259,7 @@ data_missing:
setRequestProcessed(); setRequestProcessed();
goto next; goto next2;
} }
csfd = -1; csfd = -1;
@ -1264,6 +1269,110 @@ data_missing:
resetBuffer(); resetBuffer();
/*
ptr1 = rbuffer->c_pointer(3);
ptr2 = ptr1 + 8;
if (u_get_unalignedp64(ptr1) == U_MULTICHAR_CONSTANT64(' ','/','c','a','c','h','e','d') &&
u_get_unalignedp64(ptr2) == U_MULTICHAR_CONSTANT64('_','w','o','r','l','d','s','?'))
{
usp = UHTTP::vusp->at(0);
for (ptr1 = U_http_info.query = ptr2 + 8 + U_CONSTANT_SIZE("queries"); *ptr1 != ' '; ++ptr1) {}
U_http_info.query_len = ptr1 - U_http_info.query;
U_INTERNAL_DUMP("query = %.*S", U_HTTP_QUERY_TO_TRACE)
}
else if (u_get_unalignedp64(ptr1) == U_MULTICHAR_CONSTANT64(' ','/','d','b',' ','H','T','T'))
{
usp = UHTTP::vusp->at(1);
}
else if (u_get_unalignedp64(ptr1) == U_MULTICHAR_CONSTANT64(' ','/','f','o','r','t','u','n') &&
u_get_unalignedp64(ptr2) == U_MULTICHAR_CONSTANT64('e',' ','H','T','T','P','/','1'))
{
usp = UHTTP::vusp->at(2);
}
else if (u_get_unalignedp64(ptr1) == U_MULTICHAR_CONSTANT64(' ','/','j','s','o','n',' ','H'))
{
usp = UHTTP::vusp->at(3);
}
else if (u_get_unalignedp64(ptr1) == U_MULTICHAR_CONSTANT64(' ','/','m','d','b',' ','H','T'))
{
usp = UHTTP::vusp->at(4);
}
else if (u_get_unalignedp64(ptr1) == U_MULTICHAR_CONSTANT64(' ','/','m','f','o','r','t','u') &&
u_get_unalignedp64(ptr2) == U_MULTICHAR_CONSTANT64('n','e',' ','H','T','T','P','/'))
{
usp = UHTTP::vusp->at(5);
}
else if (u_get_unalignedp64(ptr1) == U_MULTICHAR_CONSTANT64(' ','/','m','q','u','e','r','y') &&
u_get_unalignedp64(ptr2) == U_MULTICHAR_CONSTANT64('?','q','u','e','r','i','e','s'))
{
usp = UHTTP::vusp->at(6);
for (ptr1 = U_http_info.query = ptr2 + 8; *ptr1 != ' '; ++ptr1) {}
U_http_info.query_len = ptr1 - U_http_info.query;
U_INTERNAL_DUMP("query = %.*S", U_HTTP_QUERY_TO_TRACE)
}
else if (u_get_unalignedp64(ptr1) == U_MULTICHAR_CONSTANT64(' ','/','m','u','p','d','a','t') &&
u_get_unalignedp64(ptr2) == U_MULTICHAR_CONSTANT64('e','?','q','u','e','r','i','e'))
{
usp = UHTTP::vusp->at(7);
for (ptr1 = U_http_info.query = ptr2 + 8 + 1; *ptr1 != ' '; ++ptr1) {}
U_http_info.query_len = ptr1 - U_http_info.query;
U_INTERNAL_DUMP("query = %.*S", U_HTTP_QUERY_TO_TRACE)
}
else if (u_get_unalignedp64(ptr1) == U_MULTICHAR_CONSTANT64(' ','/','q','u','e','r','y','?'))
{
usp = UHTTP::vusp->at(9);
for (ptr1 = U_http_info.query = ptr2 + U_CONSTANT_SIZE("queries"); *ptr1 != ' '; ++ptr1) {}
U_http_info.query_len = ptr1 - U_http_info.query;
U_INTERNAL_DUMP("query = %.*S", U_HTTP_QUERY_TO_TRACE)
}
else if (u_get_unalignedp64(ptr1) == U_MULTICHAR_CONSTANT64(' ','/','u','p','d','a','t','e') &&
u_get_unalignedp64(ptr2) == U_MULTICHAR_CONSTANT64('?','q','u','e','r','i','e','s'))
{
usp = UHTTP::vusp->at(10);
for (ptr1 = U_http_info.query = ptr2 + 8; *ptr1 != ' '; ++ptr1) {}
U_http_info.query_len = ptr1 - U_http_info.query;
U_INTERNAL_DUMP("query = %.*S", U_HTTP_QUERY_TO_TRACE)
}
else
{
U_INTERNAL_DUMP("ptr1 = %.16S", ptr1)
goto next1;
}
U_http_content_type_len = 0;
U_http_info.nResponseCode = HTTP_OK;
usp->runDynamicPage(0);
UHTTP::setDynamicResponse();
UHTTP::ext->clear();
(void) writeResponse();
U_RETURN(U_NOTIFIER_OK);
next1:
*/
size_request = size_request =
U_ClientImage_request = 0; U_ClientImage_request = 0;
@ -1308,7 +1417,7 @@ data_missing:
if (log_request_partial == UEventFd::fd) logRequest(); if (log_request_partial == UEventFd::fd) logRequest();
# endif # endif
# ifndef U_CACHE_REQUEST_DISABLE # ifndef U_CACHE_REQUEST_DISABLE
next: next2:
# endif # endif
sz = rbuffer->size(); sz = rbuffer->size();
@ -1329,7 +1438,7 @@ next:
} }
else if (size_request < sz) // we check if we have a pipeline... else if (size_request < sz) // we check if we have a pipeline...
{ {
const char* ptr1 = rbuffer->c_pointer(size_request); ptr1 = rbuffer->c_pointer(size_request);
if (UNLIKELY(u__isspace(*ptr1))) while (u__isspace(*++ptr1)) {} if (UNLIKELY(u__isspace(*ptr1))) while (u__isspace(*++ptr1)) {}
@ -1621,6 +1730,8 @@ bool UClientImage_Base::writeResponse()
else else
#endif #endif
{ {
U_DUMP_IOVEC(iov_vec+idx,iovcnt)
U_INTERNAL_ASSERT_EQUALS(nrequest, 0) U_INTERNAL_ASSERT_EQUALS(nrequest, 0)
#if defined(USE_LIBSSL) || defined(_MSWINDOWS_) #if defined(USE_LIBSSL) || defined(_MSWINDOWS_)

7
src/ulib/net/server/plugin/usp/Makefile.am
View File

@ -22,21 +22,16 @@ clean-local:
MODULE_LIBTOOL_OPTIONS = -export-dynamic -avoid-version MODULE_LIBTOOL_OPTIONS = -export-dynamic -avoid-version
if !CROSS_COMPILING if !CROSS_COMPILING
AM_CPPFLAGS = @USP_FLAGS@
moduledir = @ULIB_MODULEDIR@/usp moduledir = @ULIB_MODULEDIR@/usp
AM_CPPFLAGS = @USP_FLAGS@
#SUFFIXES = .cpp .usp .lo .la #SUFFIXES = .cpp .usp .lo .la
#db.cpp: ./usp_translator$(EXEEXT) #db.cpp: ./usp_translator$(EXEEXT)
#json.cpp: ./usp_translator$(EXEEXT) #json.cpp: ./usp_translator$(EXEEXT)
#query.cpp: ./usp_translator$(EXEEXT) #query.cpp: ./usp_translator$(EXEEXT)
#update.cpp: ./usp_translator$(EXEEXT) #update.cpp: ./usp_translator$(EXEEXT)
#fortune.cpp: ./usp_translator$(EXEEXT) #fortune.cpp: ./usp_translator$(EXEEXT)
#plaintext.cpp: ./usp_translator$(EXEEXT) #plaintext.cpp: ./usp_translator$(EXEEXT)
.usp.cpp: ./usp_translator$(EXEEXT) .usp.cpp: ./usp_translator$(EXEEXT)

7
src/ulib/net/server/plugin/usp/Makefile.in
View File

@ -391,8 +391,8 @@ ulib_la = @ULIBS@ $(top_builddir)/src/ulib/lib@ULIB@.la
usp_translator_LDADD = $(ulib_la) @ULIB_LIBS@ usp_translator_LDADD = $(ulib_la) @ULIB_LIBS@
usp_translator_SOURCES = usp_translator.cpp usp_translator_SOURCES = usp_translator.cpp
usp_translator_LDFLAGS = $(PRG_LDFLAGS) usp_translator_LDFLAGS = $(PRG_LDFLAGS)
@CROSS_COMPILING_FALSE@AM_CPPFLAGS = @USP_FLAGS@
@CROSS_COMPILING_FALSE@moduledir = @ULIB_MODULEDIR@/usp @CROSS_COMPILING_FALSE@moduledir = @ULIB_MODULEDIR@/usp
@CROSS_COMPILING_FALSE@AM_CPPFLAGS = @USP_FLAGS@
all: all-am all: all-am
.SUFFIXES: .SUFFIXES:
@ -737,15 +737,10 @@ clean-local:
#SUFFIXES = .cpp .usp .lo .la #SUFFIXES = .cpp .usp .lo .la
#db.cpp: ./usp_translator$(EXEEXT) #db.cpp: ./usp_translator$(EXEEXT)
#json.cpp: ./usp_translator$(EXEEXT) #json.cpp: ./usp_translator$(EXEEXT)
#query.cpp: ./usp_translator$(EXEEXT) #query.cpp: ./usp_translator$(EXEEXT)
#update.cpp: ./usp_translator$(EXEEXT) #update.cpp: ./usp_translator$(EXEEXT)
#fortune.cpp: ./usp_translator$(EXEEXT) #fortune.cpp: ./usp_translator$(EXEEXT)
#plaintext.cpp: ./usp_translator$(EXEEXT) #plaintext.cpp: ./usp_translator$(EXEEXT)
@CROSS_COMPILING_FALSE@.usp.cpp: ./usp_translator$(EXEEXT) @CROSS_COMPILING_FALSE@.usp.cpp: ./usp_translator$(EXEEXT)

14
src/ulib/net/server/plugin/usp/usp_compile.sh.in
View File

@ -1,9 +1,13 @@
#!/bin/sh #!/bin/sh
# ULib - C++ application development framework # ULib - C++ application development framework
# Version: @ULIB_VERSION@
# #
# Ex: usp_compile.sh -i /home/user/project/include -o /home/user/project/build # Version....: @ULIB_VERSION@
# USP_LIBS...: @USP_LIBS@
# USP_FLAGS..: @USP_FLAGS@
# USP_LDFLAGS: @USP_LDFLAGS@
#
# Ex: usp_compile.sh -i /home/user/project/include -o /home/user/project/build <file.usp> so
# #
# -i local include directory # -i local include directory
# -o output filepath for the .so # -o output filepath for the .so
@ -17,11 +21,9 @@ while getopts "i:o:" opt; do
case $opt in case $opt in
i) i)
local_includedir=-I$OPTARG local_includedir=-I$OPTARG
echo ${local_includedir}
;; ;;
o) o)
local_build=$OPTARG local_build=$OPTARG
echo ${local_build}
;; ;;
\?) \?)
echo "Invalid option: -$OPTARG" >&2 echo "Invalid option: -$OPTARG" >&2
@ -36,7 +38,7 @@ done
shift $(( OPTIND - 1 )) shift $(( OPTIND - 1 ))
if [ -z "$1" ]; then if [ -z "$1" ]; then
exit 1 print "Usage: `basename $0` [ -i (local include directory) ] [ -o (output filepath for the .so) ] <file.usp> [so|dll]"
fi fi
dirn=`dirname $1` dirn=`dirname $1`
@ -61,6 +63,6 @@ export PATH="/sbin:/usr/sbin:/usr/local/sbin:/bin:/usr/bin:/usr/local/bin"
@ULIB_PREFIXDIR@/bin/usp_libtool.sh --silent --tag=CXX --mode=compile \ @ULIB_PREFIXDIR@/bin/usp_libtool.sh --silent --tag=CXX --mode=compile \
@CXX@ ${local_includedir} -IULIB_PREFIXDIR@/include -DHAVE_CONFIG_H @CPPFLAGS@ @CXXFLAGS@ @USP_FLAGS@ -MT $basen.lo -MD -MP -c -o $basen.lo $basen.cpp && @CXX@ ${local_includedir} -IULIB_PREFIXDIR@/include -DHAVE_CONFIG_H @CPPFLAGS@ @CXXFLAGS@ @USP_FLAGS@ -MT $basen.lo -MD -MP -c -o $basen.lo $basen.cpp &&
@ULIB_PREFIXDIR@/bin/usp_libtool.sh --silent --tag=CXX --mode=link \ @ULIB_PREFIXDIR@/bin/usp_libtool.sh --silent --tag=CXX --mode=link \
@CXX@ @CPPFLAGS@ @LDFLAGS@ @USP_LDFLAGS@ -o $basen.la -rpath @ULIB_MODULEDIR@ \ @CXX@ @CPPFLAGS@ @LDFLAGS@ @USP_LDFLAGS@ -o $basen.la -rpath @ULIB_MODULEDIR@/usp \
-module -export-dynamic -avoid-version -no-undefined $basen.lo @USP_LIBS@ -l@ULIB@ @ULIB_LIBS@ && -module -export-dynamic -avoid-version -no-undefined $basen.lo @USP_LIBS@ -l@ULIB@ @ULIB_LIBS@ &&
mv $file.usp .libs; rm -rf $basen.d $basen.la $basen.lo $basen.o $basen.cpp; mv .libs/${basen}.usp .libs/${basen}.${libsuffix} ${dirn}; rm -rf .libs mv $file.usp .libs; rm -rf $basen.d $basen.la $basen.lo $basen.o $basen.cpp; mv .libs/${basen}.usp .libs/${basen}.${libsuffix} ${dirn}; rm -rf .libs

13
src/ulib/net/server/server.cpp
View File

@ -1027,11 +1027,16 @@ bool UServer_Base::checkHitUriStats()
uint32_t sz; uint32_t sz;
const char* ptr = UClientImage_Base::getRequestUri(sz); const char* ptr = UClientImage_Base::getRequestUri(sz);
UString key(UServer_Base::client_address_len + sz); if (sz != U_CONSTANT_SIZE("/favicon.ico") &&
u_get_unalignedp64(ptr) != U_MULTICHAR_CONSTANT64('/','f','a','v','i','c','o','n') &&
u_get_unalignedp32(ptr+8) != U_MULTICHAR_CONSTANT32('.','i','c','o'))
{
UString key(UServer_Base::client_address_len + sz);
key.snprintf(U_CONSTANT_TO_PARAM("%.*s%.*s"), U_CLIENT_ADDRESS_TO_TRACE, sz, ptr); key.snprintf(U_CONSTANT_TO_PARAM("%.*s%.*s"), U_CLIENT_ADDRESS_TO_TRACE, sz, ptr);
if (checkHitStats(U_STRING_TO_PARAM(key), page_interval, page_count)) U_RETURN(true); if (checkHitStats(U_STRING_TO_PARAM(key), page_interval, page_count)) U_RETURN(true);
}
} }
U_RETURN(false); U_RETURN(false);
@ -1129,7 +1134,7 @@ public:
continue; continue;
} }
# ifndef U_SERVER_CAPTIVE_PORTAL # if !defined(U_SERVER_CAPTIVE_PORTAL) && !defined(U_LOG_DISABLE) && defined(USE_LIBZ)
if (UServer_Base::log) UServer_Base::log->checkForLogRotateDataToWrite(); if (UServer_Base::log) UServer_Base::log->checkForLogRotateDataToWrite();
if (UServer_Base::apache_like_log) UServer_Base::apache_like_log->checkForLogRotateDataToWrite(); if (UServer_Base::apache_like_log) UServer_Base::apache_like_log->checkForLogRotateDataToWrite();
# endif # endif

11
src/ulib/orm/driver/orm_driver_sqlite.cpp
View File

@ -203,11 +203,14 @@ void UOrmDriverSqlite::handlerDisConnect()
{ {
U_TRACE_NO_PARAM(0, "UOrmDriverSqlite::handlerDisConnect()") U_TRACE_NO_PARAM(0, "UOrmDriverSqlite::handlerDisConnect()")
U_INTERNAL_ASSERT_POINTER(UOrmDriver::connection) U_INTERNAL_DUMP("UOrmDriver::connection = %p", UOrmDriver::connection)
(void) U_SYSCALL(sqlite3_close, "%p", (sqlite3*)UOrmDriver::connection); if (UOrmDriver::connection)
{
(void) U_SYSCALL(sqlite3_close, "%p", (sqlite3*)UOrmDriver::connection);
UOrmDriver::connection = U_NULLPTR; UOrmDriver::connection = U_NULLPTR;
}
} }
bool UOrmDriverSqlite::handlerQuery(const char* query, uint32_t query_len) bool UOrmDriverSqlite::handlerQuery(const char* query, uint32_t query_len)
@ -286,7 +289,6 @@ void UOrmDriverSqlite::handlerStatementReset(USqlStatement* pstmt)
U_TRACE(0, "UOrmDriverSqlite::handlerStatementReset(%p)", pstmt) U_TRACE(0, "UOrmDriverSqlite::handlerStatementReset(%p)", pstmt)
U_INTERNAL_ASSERT_POINTER(pstmt) U_INTERNAL_ASSERT_POINTER(pstmt)
U_INTERNAL_ASSERT_POINTER(UOrmDriver::connection)
// reset a prepared statement object back to its initial state, ready to be re-executed // reset a prepared statement object back to its initial state, ready to be re-executed
@ -303,7 +305,6 @@ void UOrmDriverSqlite::handlerStatementRemove(USqlStatement* pstmt)
U_TRACE(0, "UOrmDriverSqlite::handlerStatementRemove(%p)", pstmt) U_TRACE(0, "UOrmDriverSqlite::handlerStatementRemove(%p)", pstmt)
U_INTERNAL_ASSERT_POINTER(pstmt) U_INTERNAL_ASSERT_POINTER(pstmt)
U_INTERNAL_ASSERT_POINTER(UOrmDriver::connection)
UOrmDriver::errcode = U_SYSCALL(sqlite3_finalize, "%p", (sqlite3_stmt*)pstmt->pHandle); UOrmDriver::errcode = U_SYSCALL(sqlite3_finalize, "%p", (sqlite3_stmt*)pstmt->pHandle);

484
src/ulib/utility/uhttp.cpp
View File

@ -1321,8 +1321,6 @@ void UHTTP::init()
setStatusDescription(); setStatusDescription();
U_http_info.nResponseCode = 0;
U_INTERNAL_ASSERT_EQUALS(old_response_code, HTTP_OK) U_INTERNAL_ASSERT_EQUALS(old_response_code, HTTP_OK)
U_MEMCPY(response_buffer, UClientImage_Base::iov_vec[0].iov_base, UClientImage_Base::iov_vec[0].iov_len); U_MEMCPY(response_buffer, UClientImage_Base::iov_vec[0].iov_base, UClientImage_Base::iov_vec[0].iov_len);
@ -1810,7 +1808,7 @@ next:
U_http_version = *ptr++; U_http_version = *ptr++;
U_INTERNAL_DUMP("U_http_version = %C U_http_info.nResponseCode = %d", U_http_version, U_http_info.nResponseCode) U_INTERNAL_DUMP("U_http_version = %C U_http_info.nResponseCode = %u", U_http_version, U_http_info.nResponseCode)
# ifndef U_HTTP2_DISABLE # ifndef U_HTTP2_DISABLE
if (U_http_version == '2') if (U_http_version == '2')
@ -1955,7 +1953,7 @@ bool UHTTP::scanfHeaderResponse(const char* ptr, uint32_t size)
U_http_info.nResponseCode = u_strtoul(ptr, ptr1); U_http_info.nResponseCode = u_strtoul(ptr, ptr1);
U_INTERNAL_DUMP("U_http_version = %C U_http_info.nResponseCode = %d", U_http_version, U_http_info.nResponseCode) U_INTERNAL_DUMP("U_http_version = %C U_http_info.nResponseCode = %u", U_http_version, U_http_info.nResponseCode)
if (U_IS_HTTP_VALID_RESPONSE(U_http_info.nResponseCode)) if (U_IS_HTTP_VALID_RESPONSE(U_http_info.nResponseCode))
{ {
@ -2116,7 +2114,7 @@ loop: sz = buffer.size();
// check for HTTP response line: HTTP/1.n 100 Continue // check for HTTP response line: HTTP/1.n 100 Continue
U_INTERNAL_DUMP("U_http_info.nResponseCode = %d", U_http_info.nResponseCode) U_INTERNAL_DUMP("U_http_info.nResponseCode = %u", U_http_info.nResponseCode)
if (UNLIKELY(U_http_info.nResponseCode == HTTP_CONTINUE)) if (UNLIKELY(U_http_info.nResponseCode == HTTP_CONTINUE))
{ {
@ -3474,7 +3472,7 @@ bool UHTTP::runCGI(bool set_environment)
next: U_DUMP("UServer_Base::isParallelizationChild() = %b UServer_Base::isParallelizationParent() = %b", next: U_DUMP("UServer_Base::isParallelizationChild() = %b UServer_Base::isParallelizationParent() = %b",
UServer_Base::isParallelizationChild(), UServer_Base::isParallelizationParent()) UServer_Base::isParallelizationChild(), UServer_Base::isParallelizationParent())
U_INTERNAL_DUMP("U_http_info.nResponseCode = %d UClientImage_Base::wbuffer(%u) = %V UClientImage_Base::body(%u) = %V", U_INTERNAL_DUMP("U_http_info.nResponseCode = %u UClientImage_Base::wbuffer(%u) = %V UClientImage_Base::body(%u) = %V",
U_http_info.nResponseCode, UClientImage_Base::wbuffer->size(), UClientImage_Base::wbuffer->rep, U_http_info.nResponseCode, UClientImage_Base::wbuffer->size(), UClientImage_Base::wbuffer->rep,
UClientImage_Base::body->size(), UClientImage_Base::body->rep) UClientImage_Base::body->size(), UClientImage_Base::body->rep)
@ -3569,7 +3567,7 @@ next:
if (U_ClientImage_parallelization != U_PARALLELIZATION_PARENT) if (U_ClientImage_parallelization != U_PARALLELIZATION_PARENT)
{ {
U_INTERNAL_DUMP("U_http_info.nResponseCode = %d UClientImage_Base::wbuffer(%u) = %V UClientImage_Base::body(%u) = %V", U_INTERNAL_DUMP("U_http_info.nResponseCode = %u UClientImage_Base::wbuffer(%u) = %V UClientImage_Base::body(%u) = %V",
U_http_info.nResponseCode, UClientImage_Base::wbuffer->size(), UClientImage_Base::wbuffer->rep, U_http_info.nResponseCode, UClientImage_Base::wbuffer->size(), UClientImage_Base::wbuffer->rep,
UClientImage_Base::body->size(), UClientImage_Base::body->rep) UClientImage_Base::body->size(), UClientImage_Base::body->rep)
@ -4399,7 +4397,7 @@ manage:
if (U_SYSCALL(stat, "%S,%p", buffer, &st) == 0) if (U_SYSCALL(stat, "%S,%p", buffer, &st) == 0)
{ {
U_DEBUG("Request usp service not in cache: %V - try to compile it", pathname->rep) U_DEBUG("Request usp service not in cache: %V - we try to compile it", pathname->rep)
(void) pathname->replace(buffer, sz); (void) pathname->replace(buffer, sz);
@ -4407,7 +4405,7 @@ manage:
manageDataForCache(UStringExt::basename(file->getPath())); manageDataForCache(UStringExt::basename(file->getPath()));
UClientImage_Base::setRequestInFileCache(); if (file_data) UClientImage_Base::setRequestInFileCache();
} }
} }
#endif #endif
@ -4755,6 +4753,15 @@ bool UHTTP::getFileInCache(const char* name, uint32_t len)
U_RETURN(false); U_RETURN(false);
} }
U_NO_EXPORT inline void UHTTP::resetFileCache()
{
U_TRACE_NO_PARAM(0, "UHTTP::resetFileCache()")
file->close();
file_data->fd = -1;
}
int UHTTP::processRequest() int UHTTP::processRequest()
{ {
U_TRACE_NO_PARAM(1, "UHTTP::processRequest()") U_TRACE_NO_PARAM(1, "UHTTP::processRequest()")
@ -4847,7 +4854,7 @@ int UHTTP::processRequest()
U_INTERNAL_DUMP("U_http_method_not_implemented = %b", U_http_method_not_implemented) U_INTERNAL_DUMP("U_http_method_not_implemented = %b", U_http_method_not_implemented)
if (UServer_Base::vplugin_name->last() != *UString::str_http) U_RETURN(U_PLUGIN_HANDLER_GO_ON); // NB: there are other plugin after this... if (UServer_Base::vplugin_name->last() != *UString::str_http) U_RETURN(U_PLUGIN_HANDLER_GO_ON); // NB: there are other plugin after this (http)...
setMethodNotImplemented(); setMethodNotImplemented();
@ -4886,8 +4893,6 @@ int UHTTP::processRequest()
* ext->snprintf(U_CONSTANT_TO_PARAM("Etag: %v\r\n"), etag->rep); * ext->snprintf(U_CONSTANT_TO_PARAM("Etag: %v\r\n"), etag->rep);
*/ */
bool result;
U_ASSERT(ext->empty()) U_ASSERT(ext->empty())
if (file->dir()) if (file->dir())
@ -4912,8 +4917,6 @@ int UHTTP::processRequest()
if (isDataFromCache()) // NB: check if we have the content of the index file in cache... if (isDataFromCache()) // NB: check if we have the content of the index file in cache...
{ {
U_http_info.nResponseCode = HTTP_OK;
# ifdef USE_LIBZ # ifdef USE_LIBZ
if (U_http_is_accept_gzip && if (U_http_is_accept_gzip &&
isDataCompressFromCache()) isDataCompressFromCache())
@ -4998,8 +5001,7 @@ int UHTTP::processRequest()
sz = UClientImage_Base::body->size(); sz = UClientImage_Base::body->size();
mime_index = U_unknow; mime_index = U_unknow;
U_http_info.nResponseCode = HTTP_OK;
(void) ext->append(getHeaderMimeType(U_NULLPTR, sz, U_CTYPE_HTML)); (void) ext->append(getHeaderMimeType(U_NULLPTR, sz, U_CTYPE_HTML));
} }
@ -5014,40 +5016,41 @@ check_file: // now we check the file...
if (file_data) if (file_data)
{ {
if (file_data->fd == -1) U_INTERNAL_DUMP("file_data->fd = %d", file_data->fd)
{
result = (file->regular() &&
file->open());
if (result) file_data->fd = file->fd; if (file_data->fd != -1)
}
else
{ {
result = true;
file->fd = file_data->fd; file->fd = file_data->fd;
goto next;
}
if (file->regular() &&
file->open())
{
file_data->fd = file->fd;
goto next;
} }
} }
else else if (file->open())
{ {
// NB: this can happen (ex: we don't cache usp file)...
result = file->open();
file_data = file_not_in_cache_data; file_data = file_not_in_cache_data;
mime_index = U_unknow; mime_index = U_unknow;
file_data->fd = file->fd; file_data->fd = file->fd;
goto next;
} }
if (result == false) U_INTERNAL_DUMP("errno = %d", errno)
{
U_INTERNAL_DUMP("errno = %d", errno)
if (errno == ENOENT) setNotFound(); if (errno == ENOENT) setNotFound();
else if (errno == EPERM) setForbidden(); else if (errno == EPERM) setForbidden();
else setServiceUnavailable(); else setServiceUnavailable();
U_RETURN(U_PLUGIN_HANDLER_FINISHED); U_RETURN(U_PLUGIN_HANDLER_FINISHED);
}
next:
U_INTERNAL_DUMP("file_data->fd = %d file_data->size = %u file_data->mode = %d file_data->mtime = %ld", U_INTERNAL_DUMP("file_data->fd = %d file_data->size = %u file_data->mode = %d file_data->mtime = %ld",
file_data->fd, file_data->size, file_data->mode, file_data->mtime) file_data->fd, file_data->size, file_data->mode, file_data->mtime)
@ -5062,7 +5065,7 @@ check_file: // now we check the file...
{ {
file_data->fd = file->fd; file_data->fd = file->fd;
if (U_SYSCALL(fstat, "%d,%p", file->fd, (struct stat*)file) != 0) goto error; if (U_SYSCALL(fstat, "%d,%p", file->fd, (struct stat*)file) != 0) goto err;
} }
} }
@ -5079,24 +5082,19 @@ check_file: // now we check the file...
{ {
if (file_data->size) if (file_data->size)
{ {
processGetRequest();
U_INTERNAL_DUMP("U_http_is_nocache_file = %b", U_http_is_nocache_file) U_INTERNAL_DUMP("U_http_is_nocache_file = %b", U_http_is_nocache_file)
if (U_http_is_nocache_file) if (processGetRequest() == false)
{ {
file->close(); if (U_http_is_nocache_file) resetFileCache();
file_data->fd = -1; U_RETURN(U_PLUGIN_HANDLER_FINISHED);
} }
U_RETURN(U_PLUGIN_HANDLER_FINISHED); if (U_http_is_nocache_file == false) goto end;
} }
error: err: resetFileCache();
file->close();
file_data->fd = -1;
} }
end: end:
@ -5209,7 +5207,7 @@ void UHTTP::setEndRequestProcessing()
} }
#endif #endif
U_INTERNAL_DUMP("U_ClientImage_request = %b U_http_info.nResponseCode = %d U_ClientImage_request_is_cached = %b U_http_info.startHeader = %u", U_INTERNAL_DUMP("U_ClientImage_request = %b U_http_info.nResponseCode = %u U_ClientImage_request_is_cached = %b U_http_info.startHeader = %u",
U_ClientImage_request, U_http_info.nResponseCode, U_ClientImage_request_is_cached, U_http_info.startHeader) U_ClientImage_request, U_http_info.nResponseCode, U_ClientImage_request_is_cached, U_http_info.startHeader)
#ifndef U_CACHE_REQUEST_DISABLE #ifndef U_CACHE_REQUEST_DISABLE
@ -5533,10 +5531,9 @@ void UHTTP::clearSessionSSL()
* 1) User submits login form. Form sends login and password to ULib server. * 1) User submits login form. Form sends login and password to ULib server.
* 2) ULib server validates login data, generates random string (session id), saves it to closed server storage * 2) ULib server validates login data, generates random string (session id), saves it to closed server storage
* in pair with user login, and sends session id to browser in response as cookie. Browser stores cookie. * in pair with user login, and sends session id to browser in response as cookie. Browser stores cookie.
* 3) User visits any page on this domain and browser sends a cookie to server for each request. * 3) User visits any page on this domain and browser sends a cookie to ULib server for each request.
* 4) ULib server checks if cookie has been sent, if such cookie exists in server storage with pair with login. Identifies user, provides access to his private content. * 4) ULib server checks if cookie has been sent, if such cookie exists in server storage with pair with login identifies user, provides access to his private content.
* 5) Logout button removes the cookie from browser and sid-login pair from server storage. Browser does not send cookies, server does not see it and does not see * 5) Logout button removes the cookie from browser and sid-login pair from server storage. Browser does not send cookies, server does not see it and does not see sid-login pair
* sid-login pair
*/ */
void UHTTP::addSetCookie(const UString& cookie) void UHTTP::addSetCookie(const UString& cookie)
@ -5640,10 +5637,10 @@ bool UHTTP::getCookie(UString* cookie, UString* data)
U_INTERNAL_DUMP("sid_counter_cur = %u", sid_counter_cur) U_INTERNAL_DUMP("sid_counter_cur = %u", sid_counter_cur)
/** /**
* XSRF (cross-site request forgery) is a problem that can be solved by using Crumbs. Crumbs is a large alphanumeric string you pass between each on your site, and it is * XSRF (cross-site request forgery) is a problem that can be solved by using Crumbs. Crumbs is a large alphanumeric string you pass between each on your site,
* a timestamp + a HMAC-MD5 encoded result of your IP address and browser user agent and a pre-defined key known only to the web server. So, the application checks the crumb * and it is a timestamp + a HMAC-MD5 encoded result of your IP address and browser user agent and a pre-defined key known only to the web server. So, the
* value on every page, and the crumb value has a specific expiration time and also is based on IP and browser, so it is difficult to forge. If the crumb value is wrong, * application checks the crumb value on every page, and the crumb value has a specific expiration time and also is based on IP and browser, so it is difficult
* then it just prevents the user from viewing that page... * to forge. If the crumb value is wrong, then it just prevents the user from viewing that page...
*/ */
check = false; check = false;
@ -6467,7 +6464,7 @@ void UHTTP::handlerResponse()
{ {
U_TRACE_NO_PARAM(0, "UHTTP::handlerResponse()") U_TRACE_NO_PARAM(0, "UHTTP::handlerResponse()")
U_INTERNAL_DUMP("U_http_info.nResponseCode = %d", U_http_info.nResponseCode) U_INTERNAL_DUMP("U_http_info.nResponseCode = %u", U_http_info.nResponseCode)
U_INTERNAL_ASSERT_MAJOR(U_http_info.nResponseCode, 0) U_INTERNAL_ASSERT_MAJOR(U_http_info.nResponseCode, 0)
@ -7126,7 +7123,7 @@ U_NO_EXPORT bool UHTTP::processAuthorization()
if (digest_authentication) if (digest_authentication)
{ {
/* /**
* A user requests page protected by digest auth: * A user requests page protected by digest auth:
* *
* - The server sends back a 401 and a WWW-Authenticate header with the value of digest along with a nonce value and a realm value * - The server sends back a 401 and a WWW-Authenticate header with the value of digest along with a nonce value and a realm value
@ -7322,7 +7319,7 @@ end:
if (result == false) if (result == false)
{ {
// NB: we cannot authorize someone if it is not present above document root almost one passwd file... // NB: we cannot authorize someone if it is not present above document root almost one auth file...
if (bpass || htdigest || htpasswd) setUnAuthorized(); if (bpass || htdigest || htpasswd) setUnAuthorized();
else setForbidden(); else setForbidden();
@ -7377,41 +7374,6 @@ __pure bool UHTTP::isTSARequest()
U_RETURN(false); U_RETURN(false);
} }
bool UHTTP::isProxyRequest()
{
U_TRACE_NO_PARAM(0, "UHTTP::isProxyRequest()")
U_INTERNAL_DUMP("U_http_is_request_nostat = %b", U_http_is_request_nostat)
if (UClientImage_Base::isRequestNotFound())
{
// check a possibly proxy service for the HTTP request
service = UModProxyService::findService();
if (service)
{
# ifdef USE_LIBSSL
if (service->isRequestCertificate() && // NB: check if it is required a certificate for this service...
UServer_Base::pClientImage->askForClientCertificate() == false)
{
service = U_NULLPTR;
UModProxyService::setMsgError(UModProxyService::BAD_REQUEST);
}
# endif
U_INTERNAL_DUMP("service->server = %V", service->server.rep)
// NB: process the HTTP PROXY request with fork....
if (UServer_Base::startParallelization() == false) U_RETURN(true); // child
}
}
U_RETURN(false);
}
__pure bool UHTTP::isFCGIRequest() __pure bool UHTTP::isFCGIRequest()
{ {
U_TRACE_NO_PARAM(0, "UHTTP::isFCGIRequest()") U_TRACE_NO_PARAM(0, "UHTTP::isFCGIRequest()")
@ -7450,7 +7412,79 @@ __pure bool UHTTP::isSCGIRequest()
U_RETURN(false); U_RETURN(false);
} }
__pure bool UHTTP::isUriRequestNeedCertificate()
{
U_TRACE_NO_PARAM(0, "UHTTP::isUriRequestNeedCertificate()")
// check if the uri request need a certificate
#ifdef USE_LIBSSL #ifdef USE_LIBSSL
if (UServer_Base::bssl &&
uri_request_cert_mask)
{
uint32_t sz;
const char* ptr = UClientImage_Base::getRequestUri(sz);
if (UServices::dosMatchWithOR(ptr, sz, U_STRING_TO_PARAM(*uri_request_cert_mask), 0)) U_RETURN(true);
}
#endif
U_RETURN(false);
}
bool UHTTP::isProxyRequest()
{
U_TRACE_NO_PARAM(0, "UHTTP::isProxyRequest()")
U_INTERNAL_DUMP("U_http_is_request_nostat = %b", U_http_is_request_nostat)
if (UClientImage_Base::isRequestNotFound())
{
// check a possibly proxy service for the HTTP request
service = UModProxyService::findService();
if (service)
{
# ifdef USE_LIBSSL
if (service->isRequestCertificate() && // NB: check if it is required a certificate for this service...
UServer_Base::pClientImage->askForClientCertificate() == false)
{
service = U_NULLPTR;
UModProxyService::setMsgError(UModProxyService::BAD_REQUEST);
}
# endif
U_INTERNAL_DUMP("service->server = %V", service->server.rep)
// NB: process the HTTP PROXY request with fork....
if (UServer_Base::startParallelization() == false) U_RETURN(true); // child
}
}
U_RETURN(false);
}
#ifdef USE_LIBSSL
__pure bool UHTTP::isUriRequestProtected()
{
U_TRACE_NO_PARAM(0, "UHTTP::isUriRequestProtected()")
// check if the uri is protected
if (uri_protected_mask)
{
uint32_t sz;
const char* ptr = UClientImage_Base::getRequestUri(sz);
if (UServices::dosMatchWithOR(ptr, sz, U_STRING_TO_PARAM(*uri_protected_mask), 0)) U_RETURN(true);
}
U_RETURN(false);
}
bool UHTTP::checkUriProtected() bool UHTTP::checkUriProtected()
{ {
U_TRACE_NO_PARAM(0, "UHTTP::checkUriProtected()") U_TRACE_NO_PARAM(0, "UHTTP::checkUriProtected()")
@ -7483,45 +7517,8 @@ bool UHTTP::checkUriProtected()
U_RETURN(false); U_RETURN(false);
} }
__pure bool UHTTP::isUriRequestProtected()
{
U_TRACE_NO_PARAM(0, "UHTTP::isUriRequestProtected()")
// check if the uri is protected
if (uri_protected_mask)
{
uint32_t sz;
const char* ptr = UClientImage_Base::getRequestUri(sz);
if (UServices::dosMatchWithOR(ptr, sz, U_STRING_TO_PARAM(*uri_protected_mask), 0)) U_RETURN(true);
}
U_RETURN(false);
}
#endif #endif
__pure bool UHTTP::isUriRequestNeedCertificate()
{
U_TRACE_NO_PARAM(0, "UHTTP::isUriRequestNeedCertificate()")
// check if the uri request need a certificate
#ifdef USE_LIBSSL
if (UServer_Base::bssl &&
uri_request_cert_mask)
{
uint32_t sz;
const char* ptr = UClientImage_Base::getRequestUri(sz);
if (UServices::dosMatchWithOR(ptr, sz, U_STRING_TO_PARAM(*uri_request_cert_mask), 0)) U_RETURN(true);
}
#endif
U_RETURN(false);
}
#ifdef U_HTTP_STRICT_TRANSPORT_SECURITY #ifdef U_HTTP_STRICT_TRANSPORT_SECURITY
__pure bool UHTTP::isUriRequestStrictTransportSecurity() __pure bool UHTTP::isUriRequestStrictTransportSecurity()
{ {
@ -7548,7 +7545,7 @@ __pure bool UHTTP::isUriRequestStrictTransportSecurity()
} }
#endif #endif
// NB: the tables must be ordered alphabetically because we use binary search algorithm (also we skip the prefix 'GET_' or 'POST_') // NB: the tables must be ordered alphabetically because we use binary search algorithm (also we skip the prefix 'GET_' or 'POST_' of the named services)
void UHTTP::manageRequest(service_info* GET_table, uint32_t n1, void UHTTP::manageRequest(service_info* GET_table, uint32_t n1,
service_info* POST_table, uint32_t n2) service_info* POST_table, uint32_t n2)
@ -7595,6 +7592,8 @@ not_found:
U_INTERNAL_DUMP("target(%u) = %.*S", target_len, target_len, target) U_INTERNAL_DUMP("target(%u) = %.*S", target_len, target_len, target)
if (target_len == 0) goto not_found; // NB: skip '/' request...
U_http_info.nResponseCode = 0; // NB: it is used by server_plugin_ssi to continue processing with a shell script... U_http_info.nResponseCode = 0; // NB: it is used by server_plugin_ssi to continue processing with a shell script...
if (u_getsuffix(target, target_len) == U_NULLPTR) // NB: else we go to the next phase of request processing... if (u_getsuffix(target, target_len) == U_NULLPTR) // NB: else we go to the next phase of request processing...
@ -7629,7 +7628,7 @@ not_found:
found: found:
table[probe].function(); table[probe].function();
U_INTERNAL_DUMP("U_http_info.nResponseCode = %d", U_http_info.nResponseCode) U_INTERNAL_DUMP("U_http_info.nResponseCode = %u", U_http_info.nResponseCode)
if (U_http_info.nResponseCode == 0) (void) UClientImage_Base::environment->append(U_CONSTANT_TO_PARAM("HTTP_RESPONSE_CODE=0\n")); if (U_http_info.nResponseCode == 0) (void) UClientImage_Base::environment->append(U_CONSTANT_TO_PARAM("HTTP_RESPONSE_CODE=0\n"));
} }
@ -8019,26 +8018,29 @@ U_NO_EXPORT void UHTTP::manageDataForCache(const UString& file_name)
U_TRACE(1, "UHTTP::manageDataForCache(%V)", file_name.rep) U_TRACE(1, "UHTTP::manageDataForCache(%V)", file_name.rep)
UString suffix; UString suffix;
uint32_t file_len = file->getPathRelativLen(); const char* ctype;
const char* file_ptr = file->getPathRelativ();
uint32_t suffix_len; uint32_t suffix_len;
const char* suffix_ptr; const char* suffix_ptr;
uint32_t file_name_len = file_name.size(); uint32_t file_name_len = file_name.size();
const char* file_name_ptr = file_name.data(); const char* file_name_ptr = file_name.data();
#ifdef DEBUG uint32_t file_len = file->getPathRelativLen();
const char* file_ptr = file->getPathRelativ();
U_INTERNAL_DUMP("pathname = %V file = %.*S rpathname = %V", pathname->rep, file_len, file_ptr, rpathname->rep)
U_INTERNAL_ASSERT(file_name) U_INTERNAL_ASSERT(file_name)
U_INTERNAL_ASSERT_POINTER(file) U_INTERNAL_ASSERT_POINTER(file)
U_INTERNAL_ASSERT_POINTER(pathname) U_INTERNAL_ASSERT_POINTER(pathname)
U_INTERNAL_ASSERT_POINTER(cache_file) U_INTERNAL_ASSERT_POINTER(cache_file)
U_INTERNAL_DUMP("pathname = %V file = %.*S rpathname = %V", pathname->rep, file_len, file_ptr, rpathname->rep) /*
if (pathname->equal(file_ptr, file_len) == false)
if (pathname->equal(file_ptr, file_len) == false) // NB: it can happen with inotify...
{ {
U_DEBUG("UHTTP::manageDataForCache(%V) pathname(%u) = %.*S file(%u) = %.*S", file_name.rep, pathname->size(), pathname->rep, file_len, file_len, file_ptr) U_DEBUG("UHTTP::manageDataForCache(%V) pathname(%u) = %V file(%u) = %.*S", file_name.rep, pathname->size(), pathname->rep, file_len, file_len, file_ptr)
} }
#endif */
U_NEW(UHTTP::UFileCacheData, file_data, UHTTP::UFileCacheData); U_NEW(UHTTP::UFileCacheData, file_data, UHTTP::UFileCacheData);
@ -8197,8 +8199,6 @@ U_NO_EXPORT void UHTTP::manageDataForCache(const UString& file_name)
if (suffix_len) if (suffix_len)
{ {
const char* ctype;
// manage authorization data... // manage authorization data...
if (suffix_len == 8) if (suffix_len == 8)
@ -8417,43 +8417,19 @@ U_NO_EXPORT void UHTTP::manageDataForCache(const UString& file_name)
check: check:
ctype = u_get_mimetype(suffix_ptr, &file_data->mime_index); ctype = u_get_mimetype(suffix_ptr, &file_data->mime_index);
U_INTERNAL_DUMP("u_is_cacheable(%d) = %b ctype = %S", file_data->mime_index, u_is_cacheable(file_data->mime_index), ctype) U_INTERNAL_DUMP("u_is_cacheable(%d) = %b", file_data->mime_index, u_is_cacheable(file_data->mime_index))
if (u_is_cacheable(file_data->mime_index)) if (u_is_cacheable(file_data->mime_index)) goto manage;
{
if (file_data->size == 0)
{
U_SRV_LOG("WARNING: found empty file: %V", pathname->rep);
}
else if (file->open())
{
UString content;
mime_index = file_data->mime_index;
if (isSizeForSendfile(file_data->size)) // NB: for major size we assume is better to use sendfile()
{
file_data->fd = file->getFd();
putDataInCache(getHeaderMimeType(U_NULLPTR, 0, ctype, U_TIME_FOR_EXPIRE), content);
}
else
{
content = file->getContent(true, false, true);
if (content.empty()) goto error;
putDataInCache(getHeaderMimeType(content.data(), 0, ctype, U_TIME_FOR_EXPIRE), content);
}
}
goto end;
}
} }
if (cache_file_mask && if (cache_file_mask &&
UServices::dosMatchWithOR(file_name_ptr, file_name_len, U_STRING_TO_PARAM(*cache_file_mask), 0)) UServices::dosMatchWithOR(file_name_ptr, file_name_len, U_STRING_TO_PARAM(*cache_file_mask), 0))
{ {
ctype = setMimeIndex(suffix_ptr);
manage:
U_INTERNAL_DUMP("ctype = %S", ctype)
if (file_data->size == 0) if (file_data->size == 0)
{ {
U_SRV_LOG("WARNING: found empty file: %V", pathname->rep); U_SRV_LOG("WARNING: found empty file: %V", pathname->rep);
@ -8461,21 +8437,21 @@ check:
else if (file->open()) else if (file->open())
{ {
UString content; UString content;
const char* ptr = U_NULLPTR;
if (isSizeForSendfile(file_data->size)) // NB: for major size we assume is better to use sendfile() mime_index = file_data->mime_index;
{
file_data->fd = file->fd;
putDataInCache(getHeaderMimeType(U_NULLPTR, 0, setMimeIndex(suffix_ptr), U_TIME_FOR_EXPIRE), content); if (isSizeForSendfile(file_data->size)) file_data->fd = file->getFd(); // NB: for major size we assume is better to use sendfile()
}
else else
{ {
content = file->getContent(true, false, true); content = file->getContent(true, false, true);
if (content.empty()) goto error; if (content.empty()) goto error;
putDataInCache(getHeaderMimeType(content.data(), 0, setMimeIndex(suffix_ptr), U_TIME_FOR_EXPIRE), content); ptr = content.data();
} }
putDataInCache(getHeaderMimeType(ptr, 0, ctype, U_TIME_FOR_EXPIRE), content);
} }
} }
@ -8642,7 +8618,7 @@ U_NO_EXPORT void UHTTP::checkPathName()
if (checkDirectoryForDocumentRoot(ptr, len1) == false) if (checkDirectoryForDocumentRoot(ptr, len1) == false)
{ {
# ifndef U_SERVER_CAPTIVE_PORTAL # if !defined(U_SERVER_CAPTIVE_PORTAL) || defined(ENABLE_THREAD)
setForbidden(); setForbidden();
# endif # endif
@ -8675,32 +8651,36 @@ U_NO_EXPORT void UHTTP::checkPathName()
if (U_http_is_request_nostat) if (U_http_is_request_nostat)
{ {
U_ClientImage_request = 0; // set to UClientImage_Base::NOT_FOUND... U_ClientImage_request = 0; // we set to UClientImage_Base::NOT_FOUND...
return; return;
} }
if (len >= 9) if (len >= 9)
{ {
// check for zombies... # if defined(U_SERVER_CAPTIVE_PORTAL) && !defined(ENABLE_THREAD)
if (u_get_unalignedp64(ptr) == U_MULTICHAR_CONSTANT64('c','h','e','c','k','Z','o','m') && if (u_get_unalignedp64(ptr) == U_MULTICHAR_CONSTANT64('c','h','e','c','k','Z','o','m') &&
u_get_unalignedp32(ptr+8) == U_MULTICHAR_CONSTANT32('b','i','e','s')) u_get_unalignedp32(ptr+8) == U_MULTICHAR_CONSTANT32('b','i','e','s'))
{ {
// ask to check for zombies...
UServer_Base::removeZombies(); UServer_Base::removeZombies();
goto nocontent; goto nocontent;
} }
# endif
// we don't wont to process this kind of request (usually aliased)... # ifdef U_ALIAS
if ( ptr[len-9] == 'n' && if ( ptr[len-9] == 'n' &&
u_get_unalignedp64(ptr+len-8) == U_MULTICHAR_CONSTANT64('o','c','o','n','t','e','n','t')) u_get_unalignedp64(ptr+len-8) == U_MULTICHAR_CONSTANT64('o','c','o','n','t','e','n','t'))
{ {
// we don't wont to process this kind of request (usually aliased)...
U_ASSERT(UStringExt::endsWith(ptr, len, U_CONSTANT_TO_PARAM("nocontent"))) U_ASSERT(UStringExt::endsWith(ptr, len, U_CONSTANT_TO_PARAM("nocontent")))
goto nocontent; goto nocontent;
} }
# endif
if (len >= U_PATH_MAX || if (len >= U_PATH_MAX ||
u_isFileName(ptr, len) == false) u_isFileName(ptr, len) == false)
@ -8742,8 +8722,6 @@ nocontent: UClientImage_Base::setCloseConnection();
} }
# endif # endif
U_INTERNAL_DUMP("U_http_is_nocache_file = %b", U_http_is_nocache_file)
# if defined(HAVE_SYS_INOTIFY_H) && defined(U_HTTP_INOTIFY_SUPPORT) # if defined(HAVE_SYS_INOTIFY_H) && defined(U_HTTP_INOTIFY_SUPPORT)
bool bstat = false; bool bstat = false;
@ -9494,12 +9472,15 @@ bool UHTTP::manageSendfile(const char* ptr, uint32_t len)
file_data->fd = file->fd; file_data->fd = file->fd;
file_data->size = file->st_size; file_data->size = file->st_size;
processGetRequest(); if (processGetRequest())
if (file_data->fd != UServer_Base::pClientImage->sfd) file->close();
else
{ {
U_ClientImage_pclose(UServer_Base::pClientImage) = U_CLOSE; handlerResponse();
if (file_data->fd != UServer_Base::pClientImage->sfd) file->close();
else
{
U_ClientImage_pclose(UServer_Base::pClientImage) = U_CLOSE;
}
} }
U_RETURN(true); U_RETURN(true);
@ -9761,7 +9742,7 @@ loop:
U_http_info.nResponseCode = u_strtoul(start, ptr1); U_http_info.nResponseCode = u_strtoul(start, ptr1);
U_INTERNAL_DUMP("U_http_info.nResponseCode = %d", U_http_info.nResponseCode) U_INTERNAL_DUMP("U_http_info.nResponseCode = %u", U_http_info.nResponseCode)
ptr1 = (const char*) memchr(ptr1, '\n', endptr - ptr1); ptr1 = (const char*) memchr(ptr1, '\n', endptr - ptr1);
@ -10038,7 +10019,7 @@ bool UHTTP::processCGIRequest(UCommand* cmd, UHTTP::ucgi* cgi)
// process the CGI or script request // process the CGI or script request
U_INTERNAL_DUMP("U_http_method_type = %B URI = %.*S U_http_info.nResponseCode = %d", U_http_method_type, U_HTTP_URI_TO_TRACE, U_http_info.nResponseCode) U_INTERNAL_DUMP("U_http_method_type = %B URI = %.*S U_http_info.nResponseCode = %u", U_http_method_type, U_HTTP_URI_TO_TRACE, U_http_info.nResponseCode)
U_ASSERT(cmd->checkForExecute()) U_ASSERT(cmd->checkForExecute())
U_INTERNAL_ASSERT(*UClientImage_Base::environment) U_INTERNAL_ASSERT(*UClientImage_Base::environment)
@ -10520,7 +10501,7 @@ U_NO_EXPORT bool UHTTP::checkGetRequestIfModified()
U_RETURN(true); U_RETURN(true);
} }
U_NO_EXPORT void UHTTP::processGetRequest() U_NO_EXPORT bool UHTTP::processGetRequest()
{ {
U_TRACE_NO_PARAM(0, "UHTTP::processGetRequest()") U_TRACE_NO_PARAM(0, "UHTTP::processGetRequest()")
@ -10546,7 +10527,7 @@ U_NO_EXPORT void UHTTP::processGetRequest()
goto sendfile; goto sendfile;
} }
if (file->memmap(PROT_READ, &mmap) == false) goto err; if (file->memmap(PROT_READ, &mmap) == false) goto error;
if (file_data == file_not_in_cache_data) if (file_data == file_not_in_cache_data)
{ {
@ -10565,8 +10546,6 @@ U_NO_EXPORT void UHTTP::processGetRequest()
range_size = file->st_size; range_size = file->st_size;
range_start = 0; range_start = 0;
U_http_info.nResponseCode = HTTP_OK;
if (U_http_range_len && if (U_http_range_len &&
checkGetRequestIfRange()) checkGetRequestIfRange())
{ {
@ -10575,94 +10554,79 @@ U_NO_EXPORT void UHTTP::processGetRequest()
// //
// Range: bytes=0-31 // Range: bytes=0-31
if (checkGetRequestForRange(mmap) != U_PARTIAL) if (checkGetRequestForRange(mmap) != U_PARTIAL) U_RETURN(true);
{
handlerResponse();
return;
}
U_http_info.nResponseCode = HTTP_PARTIAL; U_http_info.nResponseCode = HTTP_PARTIAL;
goto build_response;
} }
else
// --------------------------------------------------------------------
// NB: check for Flash pseudo-streaming
// --------------------------------------------------------------------
// Adobe Flash Player can start playing from any part of a FLV movie
// by sending the HTTP request below ('123' is the bytes offset):
//
// GET /movie.flv?start=123
//
// HTTP servers that support Flash Player requests must send the binary
// FLV Header ("FLV\x1\x1\0\0\0\x9\0\0\0\x9") before the requested data
// --------------------------------------------------------------------
if (u_is_flv(file_data->mime_index) &&
U_HTTP_QUERY_MEMEQ("start="))
{ {
U_INTERNAL_ASSERT_DIFFERS(U_http_info.nResponseCode, HTTP_PARTIAL) // --------------------------------------------------------------------
// NB: check for Flash pseudo-streaming
// --------------------------------------------------------------------
// Adobe Flash Player can start playing from any part of a FLV movie
// by sending the HTTP request below ('123' is the bytes offset):
//
// GET /movie.flv?start=123
//
// HTTP servers that support Flash Player requests must send the binary
// FLV Header ("FLV\x1\x1\0\0\0\x9\0\0\0\x9") before the requested data
// --------------------------------------------------------------------
range_start = atol(U_http_info.query + U_CONSTANT_SIZE("start=")); if (u_is_flv(file_data->mime_index) &&
U_HTTP_QUERY_MEMEQ("start="))
U_SRV_LOG("Request for flash pseudo-streaming: video = %.*S start = %u", U_FILE_TO_TRACE(*file), range_start);
if (range_start >= range_size) range_start = 0;
else
{ {
// build response... U_INTERNAL_ASSERT_DIFFERS(U_http_info.nResponseCode, HTTP_PARTIAL)
U_http_info.nResponseCode = HTTP_PARTIAL; range_start = atol(U_http_info.query + U_CONSTANT_SIZE("start="));
setResponseForRange(range_start, range_size-1, U_CONSTANT_SIZE(U_FLV_HEAD)); U_SRV_LOG("Request for flash pseudo-streaming: video = %.*S start = %u", U_FILE_TO_TRACE(*file), range_start);
handlerResponse(); if (range_start >= range_size) range_start = 0;
U_INTERNAL_DUMP("U_http_version = %C", U_http_version)
# ifndef U_HTTP2_DISABLE
if (U_http_version == '2')
{
// TODO...
}
else else
# endif {
(void) UClientImage_Base::wbuffer->append(U_CONSTANT_TO_PARAM(U_FLV_HEAD)); U_http_info.nResponseCode = HTTP_PARTIAL;
goto next; setResponseForRange(range_start, range_size-1, U_CONSTANT_SIZE(U_FLV_HEAD));
U_INTERNAL_DUMP("U_http_version = %C", U_http_version)
# ifndef U_HTTP2_DISABLE
if (U_http_version == '2')
{
// TODO...
}
else
# endif
(void) UClientImage_Base::wbuffer->append(U_CONSTANT_TO_PARAM(U_FLV_HEAD));
}
} }
} }
build_response:
handlerResponse();
next:
U_INTERNAL_DUMP("range_start = %u range_size = %u", range_start, range_size) U_INTERNAL_DUMP("range_start = %u range_size = %u", range_start, range_size)
U_ASSERT(UClientImage_Base::body->empty()) U_ASSERT(UClientImage_Base::body->empty())
// NB: we check if we can send the body with sendfile()... if (isSizeForSendfile(range_size)) // NB: we check if we can send the body with sendfile()...
if (isSizeForSendfile(range_size))
{ {
U_http_flag |= HTTP_IS_SENDFILE; U_http_flag |= HTTP_IS_SENDFILE;
sendfile: sendfile:
UClientImage_Base::setSendfile(file->fd, range_start, range_size); UClientImage_Base::setSendfile(file->fd, range_start, range_size);
return;
} }
else
if (U_http_info.nResponseCode == HTTP_PARTIAL &&
file->memmap(PROT_READ, &mmap, range_start, range_size) == false)
{ {
err: setServiceUnavailable(); if (U_http_info.nResponseCode == HTTP_PARTIAL &&
file->memmap(PROT_READ, &mmap, range_start, range_size) == false)
{
error: setServiceUnavailable();
return; U_RETURN(false);
}
*UClientImage_Base::body = mmap;
} }
*UClientImage_Base::body = mmap; U_RETURN(true);
} }
// ------------------------------------------------------------------------------------------------------------------------------------- // -------------------------------------------------------------------------------------------------------------------------------------
@ -10832,6 +10796,8 @@ U_NO_EXPORT bool UHTTP::compileUSP(const char* path, uint32_t len)
UString command(200U); UString command(200U);
// Ex: usp_compile.sh -i /home/user/project/include -o /home/user/project/build <file.usp> so
command.snprintf(U_CONSTANT_TO_PARAM("usp_compile.sh %.*s %s"), len, path, U_LIB_SUFFIX); command.snprintf(U_CONSTANT_TO_PARAM("usp_compile.sh %.*s %s"), len, path, U_LIB_SUFFIX);
UCommand cmd(command); UCommand cmd(command);