diff --git a/apache2/acmp.obj b/apache2/acmp.obj new file mode 100644 index 00000000..1f2f2e51 Binary files /dev/null and b/apache2/acmp.obj differ diff --git a/apache2/apache2_config.obj b/apache2/apache2_config.obj new file mode 100644 index 00000000..2d6abca3 Binary files /dev/null and b/apache2/apache2_config.obj differ diff --git a/apache2/apache2_io.obj b/apache2/apache2_io.obj new file mode 100644 index 00000000..d85cfd7e Binary files /dev/null and b/apache2/apache2_io.obj differ diff --git a/apache2/apache2_util.obj b/apache2/apache2_util.obj new file mode 100644 index 00000000..8fbee704 Binary files /dev/null and b/apache2/apache2_util.obj differ diff --git a/apache2/libinjection/libinjection_sqli.obj b/apache2/libinjection/libinjection_sqli.obj new file mode 100644 index 00000000..7b8a8649 Binary files /dev/null and b/apache2/libinjection/libinjection_sqli.obj differ diff --git a/apache2/mod_security2.exp b/apache2/mod_security2.exp new file mode 100644 index 00000000..0ab08b1e Binary files /dev/null and b/apache2/mod_security2.exp differ diff --git a/apache2/mod_security2.lib b/apache2/mod_security2.lib new file mode 100644 index 00000000..8d76f1fa Binary files /dev/null and b/apache2/mod_security2.lib differ diff --git a/apache2/mod_security2.obj b/apache2/mod_security2.obj new file mode 100644 index 00000000..a471f6e8 Binary files /dev/null and b/apache2/mod_security2.obj differ diff --git a/apache2/mod_security2.so b/apache2/mod_security2.so new file mode 100644 index 00000000..b574ed02 Binary files /dev/null and b/apache2/mod_security2.so differ diff --git a/apache2/modsecurity.obj b/apache2/modsecurity.obj new file mode 100644 index 00000000..6884e172 Binary files /dev/null and b/apache2/modsecurity.obj differ diff --git a/apache2/msc_crypt.obj b/apache2/msc_crypt.obj new file mode 100644 index 00000000..32f69fec Binary files /dev/null and b/apache2/msc_crypt.obj differ diff --git a/apache2/msc_geo.obj b/apache2/msc_geo.obj new file mode 100644 index 00000000..cfd4112c Binary files /dev/null and b/apache2/msc_geo.obj differ diff --git a/apache2/msc_gsb.obj b/apache2/msc_gsb.obj new file mode 100644 index 00000000..11457408 Binary files /dev/null and b/apache2/msc_gsb.obj differ diff --git a/apache2/msc_logging.obj b/apache2/msc_logging.obj new file mode 100644 index 00000000..c501dc52 Binary files /dev/null and b/apache2/msc_logging.obj differ diff --git a/apache2/msc_lua.obj b/apache2/msc_lua.obj new file mode 100644 index 00000000..c46386f9 Binary files /dev/null and b/apache2/msc_lua.obj differ diff --git a/apache2/msc_multipart.obj b/apache2/msc_multipart.obj new file mode 100644 index 00000000..e02bf817 Binary files /dev/null and b/apache2/msc_multipart.obj differ diff --git a/apache2/msc_parsers.obj b/apache2/msc_parsers.obj new file mode 100644 index 00000000..d51b598d Binary files /dev/null and b/apache2/msc_parsers.obj differ diff --git a/apache2/msc_pcre.obj b/apache2/msc_pcre.obj new file mode 100644 index 00000000..a03bba23 Binary files /dev/null and b/apache2/msc_pcre.obj differ diff --git a/apache2/msc_release.obj b/apache2/msc_release.obj new file mode 100644 index 00000000..bf638691 Binary files /dev/null and b/apache2/msc_release.obj differ diff --git a/apache2/msc_reqbody.obj b/apache2/msc_reqbody.obj new file mode 100644 index 00000000..4676b4d2 Binary files /dev/null and b/apache2/msc_reqbody.obj differ diff --git a/apache2/msc_tree.obj b/apache2/msc_tree.obj new file mode 100644 index 00000000..8ac388dc Binary files /dev/null and b/apache2/msc_tree.obj differ diff --git a/apache2/msc_unicode.obj b/apache2/msc_unicode.obj new file mode 100644 index 00000000..3558c28c Binary files /dev/null and b/apache2/msc_unicode.obj differ diff --git a/apache2/msc_util.obj b/apache2/msc_util.obj new file mode 100644 index 00000000..569c4df1 Binary files /dev/null and b/apache2/msc_util.obj differ diff --git a/apache2/msc_xml.obj b/apache2/msc_xml.obj new file mode 100644 index 00000000..85a57eb3 Binary files /dev/null and b/apache2/msc_xml.obj differ diff --git a/apache2/persist_dbm.obj b/apache2/persist_dbm.obj new file mode 100644 index 00000000..3647d6e2 Binary files /dev/null and b/apache2/persist_dbm.obj differ diff --git a/apache2/re.obj b/apache2/re.obj new file mode 100644 index 00000000..1aa78599 Binary files /dev/null and b/apache2/re.obj differ diff --git a/apache2/re_actions.obj b/apache2/re_actions.obj new file mode 100644 index 00000000..001360bf Binary files /dev/null and b/apache2/re_actions.obj differ diff --git a/apache2/re_operators.obj b/apache2/re_operators.obj new file mode 100644 index 00000000..135155b3 Binary files /dev/null and b/apache2/re_operators.obj differ diff --git a/apache2/re_tfns.obj b/apache2/re_tfns.obj new file mode 100644 index 00000000..1cf7b2a9 Binary files /dev/null and b/apache2/re_tfns.obj differ diff --git a/apache2/re_variables.obj b/apache2/re_variables.obj new file mode 100644 index 00000000..7e3d4d82 Binary files /dev/null and b/apache2/re_variables.obj differ diff --git a/java/Makefile.am b/java/Makefile.am index ae5a8dbe..9868044a 100644 --- a/java/Makefile.am +++ b/java/Makefile.am @@ -1,5 +1,9 @@ pkglibdir = $(prefix)/lib pkglib_LTLIBRARIES = libModSecurityJNI.la +#include_HEADERS = re.h modsecurity.h msc_logging.h msc_multipart.h \ +# msc_parsers.h msc_pcre.h msc_util.h msc_xml.h \ +# persist_dbm.h apache2.h msc_geo.h acmp.h utf8tables.h \ +# msc_lua.h msc_release.h libModSecurityJNI_la_SOURCES = ../apache2/mod_security2.c \ ../apache2/apache2_config.c ../apache2/apache2_io.c ../apache2/apache2_util.c \ @@ -7,19 +11,19 @@ libModSecurityJNI_la_SOURCES = ../apache2/mod_security2.c \ ../apache2/re_variables.c ../apache2/msc_logging.c ../apache2/msc_xml.c \ ../apache2/msc_multipart.c ../apache2/modsecurity.c ../apache2/msc_parsers.c \ ../apache2/msc_util.c ../apache2/msc_pcre.c ../apache2/persist_dbm.c ../apache2/msc_reqbody.c \ - ../apache2/msc_geo.c ../apache2/msc_gsb.c ../apache2/msc_unicode.c \ - ../apache2/acmp.c ../apache2/msc_lua.c ../apache2/msc_release.c \ - ../apache2/msc_crypt.c ../apache2/msc_tree.c - ../standalone/api.c ../standalone/buckets.c \ - ../standalone/config.c ../standalone/filters.c \ - ../standalone/hooks.c ../standalone/regex.c ../standalone/server.c \ - org_modsecurity_ModSecurity.c + ../apache2/msc_geo.c ../apache2/msc_gsb.c ../apache2/msc_unicode.c \ + ../apache2/acmp.c ../apache2/msc_lua.c ../apache2/msc_release.c \ + ../apache2/msc_crypt.c ../apache2/msc_tree.c ../apache2/libinjection/libinjection_sqli.c \ + ../standalone/api.c ../standalone/buckets.c \ + ../standalone/config.c ../standalone/filters.c \ + ../standalone/hooks.c ../standalone/regex.c ../standalone/server.c \ + org_modsecurity_ModSecurity.c libModSecurityJNI_la_CFLAGS = @APXS_CFLAGS@ @APR_CFLAGS@ @APU_CFLAGS@ \ - @PCRE_CFLAGS@ @LIBXML2_CFLAGS@ @LUA_CFLAGS@ @MODSEC_EXTRA_CFLAGS@ @CURL_CFLAGS@ + @PCRE_CFLAGS@ @LIBXML2_CFLAGS@ @LUA_CFLAGS@ @MODSEC_EXTRA_CFLAGS@ @CURL_CFLAGS@ -DVERSION_NGINX #libModSecurityJNI_la_CXXFLAGS = @APXS_CFLAGS@ @APR_CFLAGS@ @APU_CFLAGS@ \ # @PCRE_CFLAGS@ @LIBXML2_CFLAGS@ @LUA_CFLAGS@ @MODSEC_EXTRA_CFLAGS@ @CURL_CFLAGS@ -libModSecurityJNI_la_CPPFLAGS = @APR_CPPFLAGS@ @PCRE_CPPFLAGS@ @LIBXML2_CPPFLAGS@ @JNI_CPPFLAGS@ +libModSecurityJNI_la_CPPFLAGS = @APR_CPPFLAGS@ @PCRE_CPPFLAGS@ @LIBXML2_CPPFLAGS@ @JNI_CPPFLAGS@ @STANDALONE_CPPFLAGS@ libModSecurityJNI_la_LIBADD = @APR_LDADD@ @APU_LDADD@ @PCRE_LDADD@ @LIBXML2_LDADD@ @LUA_LDADD@ if AIX diff --git a/java/ModSecurityJNI.vcxproj b/java/ModSecurityJNI.vcxproj index d25bd911..7919fdfd 100644 --- a/java/ModSecurityJNI.vcxproj +++ b/java/ModSecurityJNI.vcxproj @@ -71,7 +71,7 @@ Level3 Disabled - ..\standalone;c:\Program Files (x86)\Java\jdk1.7.0_21\include\win32;c:\Program Files (x86)\Java\jdk1.7.0_21\include;C:\work\pcre-8.30\include;C:\work\pcre-8.30;C:\work\libxml2-2.7.7\include;C:\apache22\include;..\apache2;c:\work\httpd-2.2.24\include + ..\standalone;c:\Program Files (x86)\Java\jdk1.7.0_21\include\win32;c:\Program Files (x86)\Java\jdk1.7.0_21\include;C:\work\pcre-8.30\include;C:\work\pcre-8.30;C:\work\libxml2-2.7.7\include;C:\apache22\include;..\apache2;..\apache\libinjection\;c:\work\httpd-2.2.24\include _MBCS;%(PreprocessorDefinitions);WIN32;WINNT;inline=APR_INLINE;AP_DECLARE_STATIC;VERSION_STANDALONE 4244;4018 diff --git a/java/ModSecurityLoader/dist/ModSecurityLoader.jar b/java/ModSecurityLoader/dist/ModSecurityLoader.jar index 760dcf1b..867a2714 100644 Binary files a/java/ModSecurityLoader/dist/ModSecurityLoader.jar and b/java/ModSecurityLoader/dist/ModSecurityLoader.jar differ diff --git a/java/ModSecurityLoader/src/org/modsecurity/loader/ModSecurityLoader.java b/java/ModSecurityLoader/src/org/modsecurity/loader/ModSecurityLoader.java index 12465a6d..23e5d534 100644 --- a/java/ModSecurityLoader/src/org/modsecurity/loader/ModSecurityLoader.java +++ b/java/ModSecurityLoader/src/org/modsecurity/loader/ModSecurityLoader.java @@ -46,7 +46,7 @@ public class ModSecurityLoader { } } - public void main(String[] args) { + public static void main(String[] args) { } } diff --git a/java/ModSecurityTestApp/dist/ModSecurityTestApp.war b/java/ModSecurityTestApp/dist/ModSecurityTestApp.war new file mode 100644 index 00000000..673092da Binary files /dev/null and b/java/ModSecurityTestApp/dist/ModSecurityTestApp.war differ diff --git a/java/ModSecurityTestApp/src/java/org/modsecurity/ModSecurity.java b/java/ModSecurityTestApp/src/java/org/modsecurity/ModSecurity.java index 506bf0c4..3456062a 100644 --- a/java/ModSecurityTestApp/src/java/org/modsecurity/ModSecurity.java +++ b/java/ModSecurityTestApp/src/java/org/modsecurity/ModSecurity.java @@ -22,7 +22,6 @@ public final class ModSecurity { //ModSecurityLoader calls System.load() for every native library needed by ModSecurity. // try { // Class.forName("org.modsecurity.loader.ModSecurityLoader"); -// System.out.println("ModSecurity libraries loaded."); // } catch (ClassNotFoundException ex) { // java.util.logging.Logger.getLogger(ModSecurity.class.getName()).log(java.util.logging.Level.SEVERE, // "ModSecurityLoader was not found, please make sure that you have \"ModSecurityLoader.jar\" in your server lib folder.", ex); @@ -30,13 +29,6 @@ public final class ModSecurity { //If the ModSecurityLoader is not used, native libraries can be loaded here, however this is bad practice since this will raise UnsatisfiedLinkError if //ModSecurity is used in multiple webapps. This will also will raise problems when the web-app is redeployed and the server is running. -// System.load("c:\\work\\mod_security\\java\\libs\\zlib1.dll"); -// System.load("c:\\work\\mod_security\\java\\libs\\libxml2.dll"); -// System.load("c:\\work\\mod_security\\java\\libs\\pcre.dll"); -// System.load("c:\\work\\mod_security\\java\\libs\\libapr-1.dll"); -// System.load("c:\\work\\mod_security\\java\\libs\\libapriconv-1.dll"); -// System.load("c:\\work\\mod_security\\java\\libs\\libaprutil-1.dll"); -// System.load("c:\\work\\mod_security\\java\\Debug\\ModSecurityJNI.dll"); try { System.loadLibrary("zlib1"); //needed for libxml2 in Windows } catch(UnsatisfiedLinkError ex) { @@ -45,11 +37,20 @@ public final class ModSecurity { System.loadLibrary("pcre"); System.loadLibrary("libapr-1"); try { - System.loadLibrary("libapriconv-1"); - } catch(UnsatisfiedLinkError ex) { //needed for libaprutil-1 in Windows + System.loadLibrary("libapriconv-1"); //needed for libaprutil-1 in Windows + } catch(UnsatisfiedLinkError ex) { } System.loadLibrary("libaprutil-1"); System.loadLibrary("ModSecurityJNI"); + //System.loadLibrary tries to resolve native libraries from java.library.path variable. If this fails, absolute path to libraries + //can be specified using System.load("/path/lib.so") +// try { System.load("c:\\work\\mod_security\\java\\libs\\zlib1.dll"); } catch(UnsatisfiedLinkError ex) {} +// System.load("c:\\work\\mod_security\\java\\libs\\libxml2.dll"); +// System.load("c:\\work\\mod_security\\java\\libs\\pcre.dll"); +// System.load("c:\\work\\mod_security\\java\\libs\\libapr-1.dll"); +// try { System.load("c:\\work\\mod_security\\java\\libs\\libapriconv-1.dll"); } catch(UnsatisfiedLinkError ex) {} +// System.load("c:\\work\\mod_security\\java\\libs\\libaprutil-1.dll"); +// System.load("c:\\work\\mod_security\\java\\Debug\\ModSecurityJNI.dll"); } public ModSecurity(FilterConfig fc, String confFile) throws ServletException { diff --git a/java/org_modsecurity_ModSecurity.c b/java/org_modsecurity_ModSecurity.c index 64d8865a..4ef9932a 100644 --- a/java/org_modsecurity_ModSecurity.c +++ b/java/org_modsecurity_ModSecurity.c @@ -214,8 +214,14 @@ void logSec(void *obj, int level, char *str) apr_status_t ReadBodyCallback(request_rec *r, char *buf, unsigned int length, unsigned int *readcnt, int *is_eos) { - jobject inputStream = getJavaServletContext(r, JAVASERVLET_INSTREAM); //servlet request input stream JNIEnv *env; + jclass inputStreamClass; + jmethodID read; + jbyteArray byteArrayBuf; + jint count; + jbyte *bufferPtr; + jobject inputStream = getJavaServletContext(r, JAVASERVLET_INSTREAM); //servlet request input stream + *readcnt = 0; @@ -228,13 +234,13 @@ apr_status_t ReadBodyCallback(request_rec *r, char *buf, unsigned int length, un if (!(*jvm)->AttachCurrentThread(jvm, (void **)&env, NULL)) { //read request body from the servlet input stream using 'read' method - jclass inputStreamClass = (*env)->FindClass(env, SERVLETINPUTSTREAM_JAVACLASS); - jmethodID read = (*env)->GetMethodID(env, inputStreamClass, INPUTSTREAM_READ_MET, INPUTSTREAM_READ_SIG); + inputStreamClass = (*env)->FindClass(env, SERVLETINPUTSTREAM_JAVACLASS); + read = (*env)->GetMethodID(env, inputStreamClass, INPUTSTREAM_READ_MET, INPUTSTREAM_READ_SIG); - jbyteArray byteArrayBuf = (*env)->NewByteArray(env, length); + byteArrayBuf = (*env)->NewByteArray(env, length); - jint count = (*env)->CallIntMethod(env, inputStream, read, byteArrayBuf, 0, length); - jbyte* bufferPtr = (*env)->GetByteArrayElements(env, byteArrayBuf, NULL); + count = (*env)->CallIntMethod(env, inputStream, read, byteArrayBuf, 0, length); + bufferPtr = (*env)->GetByteArrayElements(env, byteArrayBuf, NULL); if (count == -1 || count > length || (*env)->ExceptionCheck(env) == JNI_TRUE) //end of stream { diff --git a/standalone/Debug/CL.read.1.tlog b/standalone/Debug/CL.read.1.tlog new file mode 100644 index 00000000..56b9ce82 Binary files /dev/null and b/standalone/Debug/CL.read.1.tlog differ diff --git a/standalone/Debug/CL.write.1.tlog b/standalone/Debug/CL.write.1.tlog new file mode 100644 index 00000000..836eb92d Binary files /dev/null and b/standalone/Debug/CL.write.1.tlog differ diff --git a/standalone/Debug/acmp.obj b/standalone/Debug/acmp.obj new file mode 100644 index 00000000..273b591d Binary files /dev/null and b/standalone/Debug/acmp.obj differ diff --git a/standalone/Debug/apache2_config.obj b/standalone/Debug/apache2_config.obj new file mode 100644 index 00000000..1080b6b3 Binary files /dev/null and b/standalone/Debug/apache2_config.obj differ diff --git a/standalone/Debug/apache2_io.obj b/standalone/Debug/apache2_io.obj new file mode 100644 index 00000000..23c8d838 Binary files /dev/null and b/standalone/Debug/apache2_io.obj differ diff --git a/standalone/Debug/apache2_util.obj b/standalone/Debug/apache2_util.obj new file mode 100644 index 00000000..c87ef99b Binary files /dev/null and b/standalone/Debug/apache2_util.obj differ diff --git a/standalone/Debug/api.obj b/standalone/Debug/api.obj new file mode 100644 index 00000000..0da766b9 Binary files /dev/null and b/standalone/Debug/api.obj differ diff --git a/standalone/Debug/buckets.obj b/standalone/Debug/buckets.obj new file mode 100644 index 00000000..7ad6f437 Binary files /dev/null and b/standalone/Debug/buckets.obj differ diff --git a/standalone/Debug/cl.command.1.tlog b/standalone/Debug/cl.command.1.tlog new file mode 100644 index 00000000..4b830684 Binary files /dev/null and b/standalone/Debug/cl.command.1.tlog differ diff --git a/standalone/Debug/config.obj b/standalone/Debug/config.obj new file mode 100644 index 00000000..4f9e6d36 Binary files /dev/null and b/standalone/Debug/config.obj differ diff --git a/standalone/Debug/filters.obj b/standalone/Debug/filters.obj new file mode 100644 index 00000000..9d8c9fd5 Binary files /dev/null and b/standalone/Debug/filters.obj differ diff --git a/standalone/Debug/hooks.obj b/standalone/Debug/hooks.obj new file mode 100644 index 00000000..79198b36 Binary files /dev/null and b/standalone/Debug/hooks.obj differ diff --git a/standalone/Debug/link-cvtres.read.1.tlog b/standalone/Debug/link-cvtres.read.1.tlog new file mode 100644 index 00000000..46b134b1 --- /dev/null +++ b/standalone/Debug/link-cvtres.read.1.tlog @@ -0,0 +1 @@ +ÿþ \ No newline at end of file diff --git a/standalone/Debug/link-cvtres.write.1.tlog b/standalone/Debug/link-cvtres.write.1.tlog new file mode 100644 index 00000000..46b134b1 --- /dev/null +++ b/standalone/Debug/link-cvtres.write.1.tlog @@ -0,0 +1 @@ +ÿþ \ No newline at end of file diff --git a/standalone/Debug/link-rc.read.1.tlog b/standalone/Debug/link-rc.read.1.tlog new file mode 100644 index 00000000..46b134b1 --- /dev/null +++ b/standalone/Debug/link-rc.read.1.tlog @@ -0,0 +1 @@ +ÿþ \ No newline at end of file diff --git a/standalone/Debug/link-rc.write.1.tlog b/standalone/Debug/link-rc.write.1.tlog new file mode 100644 index 00000000..46b134b1 --- /dev/null +++ b/standalone/Debug/link-rc.write.1.tlog @@ -0,0 +1 @@ +ÿþ \ No newline at end of file diff --git a/standalone/Debug/link.command.1.tlog b/standalone/Debug/link.command.1.tlog new file mode 100644 index 00000000..46b134b1 --- /dev/null +++ b/standalone/Debug/link.command.1.tlog @@ -0,0 +1 @@ +ÿþ \ No newline at end of file diff --git a/standalone/Debug/link.read.1.tlog b/standalone/Debug/link.read.1.tlog new file mode 100644 index 00000000..46b134b1 --- /dev/null +++ b/standalone/Debug/link.read.1.tlog @@ -0,0 +1 @@ +ÿþ \ No newline at end of file diff --git a/standalone/Debug/link.write.1.tlog b/standalone/Debug/link.write.1.tlog new file mode 100644 index 00000000..46b134b1 --- /dev/null +++ b/standalone/Debug/link.write.1.tlog @@ -0,0 +1 @@ +ÿþ \ No newline at end of file diff --git a/standalone/Debug/main.obj b/standalone/Debug/main.obj new file mode 100644 index 00000000..bdcb7d6a Binary files /dev/null and b/standalone/Debug/main.obj differ diff --git a/standalone/Debug/mod_security2.obj b/standalone/Debug/mod_security2.obj new file mode 100644 index 00000000..55443f4d Binary files /dev/null and b/standalone/Debug/mod_security2.obj differ diff --git a/standalone/Debug/modsecurity.obj b/standalone/Debug/modsecurity.obj new file mode 100644 index 00000000..25f24c15 Binary files /dev/null and b/standalone/Debug/modsecurity.obj differ diff --git a/standalone/Debug/msc_crypt.obj b/standalone/Debug/msc_crypt.obj new file mode 100644 index 00000000..03cc1cff Binary files /dev/null and b/standalone/Debug/msc_crypt.obj differ diff --git a/standalone/Debug/msc_geo.obj b/standalone/Debug/msc_geo.obj new file mode 100644 index 00000000..9be499f7 Binary files /dev/null and b/standalone/Debug/msc_geo.obj differ diff --git a/standalone/Debug/msc_gsb.obj b/standalone/Debug/msc_gsb.obj new file mode 100644 index 00000000..3a44f0b4 Binary files /dev/null and b/standalone/Debug/msc_gsb.obj differ diff --git a/standalone/Debug/msc_logging.obj b/standalone/Debug/msc_logging.obj new file mode 100644 index 00000000..15b1f7d0 Binary files /dev/null and b/standalone/Debug/msc_logging.obj differ diff --git a/standalone/Debug/msc_lua.obj b/standalone/Debug/msc_lua.obj new file mode 100644 index 00000000..ea14cd9d Binary files /dev/null and b/standalone/Debug/msc_lua.obj differ diff --git a/standalone/Debug/msc_multipart.obj b/standalone/Debug/msc_multipart.obj new file mode 100644 index 00000000..92755abd Binary files /dev/null and b/standalone/Debug/msc_multipart.obj differ diff --git a/standalone/Debug/msc_parsers.obj b/standalone/Debug/msc_parsers.obj new file mode 100644 index 00000000..c9b280ed Binary files /dev/null and b/standalone/Debug/msc_parsers.obj differ diff --git a/standalone/Debug/msc_pcre.obj b/standalone/Debug/msc_pcre.obj new file mode 100644 index 00000000..38faf888 Binary files /dev/null and b/standalone/Debug/msc_pcre.obj differ diff --git a/standalone/Debug/msc_release.obj b/standalone/Debug/msc_release.obj new file mode 100644 index 00000000..1f42c677 Binary files /dev/null and b/standalone/Debug/msc_release.obj differ diff --git a/standalone/Debug/msc_reqbody.obj b/standalone/Debug/msc_reqbody.obj new file mode 100644 index 00000000..bd754e83 Binary files /dev/null and b/standalone/Debug/msc_reqbody.obj differ diff --git a/standalone/Debug/msc_tree.obj b/standalone/Debug/msc_tree.obj new file mode 100644 index 00000000..5756dd03 Binary files /dev/null and b/standalone/Debug/msc_tree.obj differ diff --git a/standalone/Debug/msc_unicode.obj b/standalone/Debug/msc_unicode.obj new file mode 100644 index 00000000..9f634752 Binary files /dev/null and b/standalone/Debug/msc_unicode.obj differ diff --git a/standalone/Debug/msc_util.obj b/standalone/Debug/msc_util.obj new file mode 100644 index 00000000..e8e536a4 Binary files /dev/null and b/standalone/Debug/msc_util.obj differ diff --git a/standalone/Debug/msc_xml.obj b/standalone/Debug/msc_xml.obj new file mode 100644 index 00000000..cdd563df Binary files /dev/null and b/standalone/Debug/msc_xml.obj differ diff --git a/standalone/Debug/persist_dbm.obj b/standalone/Debug/persist_dbm.obj new file mode 100644 index 00000000..39ad803b Binary files /dev/null and b/standalone/Debug/persist_dbm.obj differ diff --git a/standalone/Debug/re.obj b/standalone/Debug/re.obj new file mode 100644 index 00000000..245e35ac Binary files /dev/null and b/standalone/Debug/re.obj differ diff --git a/standalone/Debug/re_actions.obj b/standalone/Debug/re_actions.obj new file mode 100644 index 00000000..f7e68a9e Binary files /dev/null and b/standalone/Debug/re_actions.obj differ diff --git a/standalone/Debug/re_operators.obj b/standalone/Debug/re_operators.obj new file mode 100644 index 00000000..585f773c Binary files /dev/null and b/standalone/Debug/re_operators.obj differ diff --git a/standalone/Debug/re_tfns.obj b/standalone/Debug/re_tfns.obj new file mode 100644 index 00000000..7d74a9f1 Binary files /dev/null and b/standalone/Debug/re_tfns.obj differ diff --git a/standalone/Debug/re_variables.obj b/standalone/Debug/re_variables.obj new file mode 100644 index 00000000..87457577 Binary files /dev/null and b/standalone/Debug/re_variables.obj differ diff --git a/standalone/Debug/regex.obj b/standalone/Debug/regex.obj new file mode 100644 index 00000000..6be34515 Binary files /dev/null and b/standalone/Debug/regex.obj differ diff --git a/standalone/Debug/server.obj b/standalone/Debug/server.obj new file mode 100644 index 00000000..0fdf699a Binary files /dev/null and b/standalone/Debug/server.obj differ diff --git a/standalone/Debug/standalone.Build.CppClean.log b/standalone/Debug/standalone.Build.CppClean.log new file mode 100644 index 00000000..9eae8d5a --- /dev/null +++ b/standalone/Debug/standalone.Build.CppClean.log @@ -0,0 +1,84 @@ +C:\WORK\MOD_SECURITY2\STANDALONE\DEBUG\MSC_PCRE.OBJ +C:\WORK\MOD_SECURITY2\STANDALONE\DEBUG\MSC_RELEASE.OBJ +C:\WORK\MOD_SECURITY2\STANDALONE\DEBUG\MSC_REQBODY.OBJ +C:\WORK\MOD_SECURITY2\STANDALONE\DEBUG\MSC_TREE.OBJ +C:\WORK\MOD_SECURITY2\STANDALONE\DEBUG\MSC_UNICODE.OBJ +C:\WORK\MOD_SECURITY2\STANDALONE\DEBUG\MSC_UTIL.OBJ +C:\WORK\MOD_SECURITY2\STANDALONE\DEBUG\MSC_XML.OBJ +C:\WORK\MOD_SECURITY2\STANDALONE\DEBUG\PERSIST_DBM.OBJ +C:\WORK\MOD_SECURITY2\STANDALONE\DEBUG\RE.OBJ +C:\WORK\MOD_SECURITY2\STANDALONE\DEBUG\RE_ACTIONS.OBJ +C:\WORK\MOD_SECURITY2\STANDALONE\DEBUG\RE_OPERATORS.OBJ +C:\WORK\MOD_SECURITY2\STANDALONE\DEBUG\RE_TFNS.OBJ +C:\WORK\MOD_SECURITY2\STANDALONE\DEBUG\RE_VARIABLES.OBJ +C:\WORK\MOD_SECURITY2\STANDALONE\DEBUG\API.OBJ +C:\WORK\MOD_SECURITY2\STANDALONE\DEBUG\BUCKETS.OBJ +C:\WORK\MOD_SECURITY2\STANDALONE\DEBUG\CONFIG.OBJ +C:\WORK\MOD_SECURITY2\STANDALONE\DEBUG\FILTERS.OBJ +C:\WORK\MOD_SECURITY2\STANDALONE\DEBUG\HOOKS.OBJ +C:\WORK\MOD_SECURITY2\STANDALONE\DEBUG\REGEX.OBJ +C:\WORK\MOD_SECURITY2\STANDALONE\DEBUG\SERVER.OBJ +C:\WORK\MOD_SECURITY2\STANDALONE\DEBUG\ACMP.OBJ +C:\WORK\MOD_SECURITY2\STANDALONE\DEBUG\APACHE2_CONFIG.OBJ +C:\WORK\MOD_SECURITY2\STANDALONE\DEBUG\APACHE2_IO.OBJ +C:\WORK\MOD_SECURITY2\STANDALONE\DEBUG\APACHE2_UTIL.OBJ +C:\WORK\MOD_SECURITY2\STANDALONE\DEBUG\MODSECURITY.OBJ +C:\WORK\MOD_SECURITY2\STANDALONE\DEBUG\MOD_SECURITY2.OBJ +C:\WORK\MOD_SECURITY2\STANDALONE\DEBUG\MSC_CRYPT.OBJ +C:\WORK\MOD_SECURITY2\STANDALONE\DEBUG\MSC_GEO.OBJ +C:\WORK\MOD_SECURITY2\STANDALONE\DEBUG\MSC_GSB.OBJ +C:\WORK\MOD_SECURITY2\STANDALONE\DEBUG\MSC_LOGGING.OBJ +C:\WORK\MOD_SECURITY2\STANDALONE\DEBUG\MSC_LUA.OBJ +C:\WORK\MOD_SECURITY2\STANDALONE\DEBUG\MSC_MULTIPART.OBJ +C:\WORK\MOD_SECURITY2\STANDALONE\DEBUG\MSC_PARSERS.OBJ +C:\WORK\MOD_SECURITY2\STANDALONE\DEBUG\VC110.PDB +C:\WORK\MOD_SECURITY2\STANDALONE\DEBUG\MAIN.OBJ +c:\work\mod_security2\standalone\Debug\acmp.obj +c:\work\mod_security2\standalone\Debug\apache2_config.obj +c:\work\mod_security2\standalone\Debug\apache2_io.obj +c:\work\mod_security2\standalone\Debug\apache2_util.obj +c:\work\mod_security2\standalone\Debug\api.obj +c:\work\mod_security2\standalone\Debug\buckets.obj +c:\work\mod_security2\standalone\Debug\config.obj +c:\work\mod_security2\standalone\Debug\filters.obj +c:\work\mod_security2\standalone\Debug\hooks.obj +c:\work\mod_security2\standalone\Debug\main.obj +c:\work\mod_security2\standalone\Debug\modsecurity.obj +c:\work\mod_security2\standalone\Debug\mod_security2.obj +c:\work\mod_security2\standalone\Debug\msc_crypt.obj +c:\work\mod_security2\standalone\Debug\msc_geo.obj +c:\work\mod_security2\standalone\Debug\msc_gsb.obj +c:\work\mod_security2\standalone\Debug\msc_logging.obj +c:\work\mod_security2\standalone\Debug\msc_lua.obj +c:\work\mod_security2\standalone\Debug\msc_multipart.obj +c:\work\mod_security2\standalone\Debug\msc_parsers.obj +c:\work\mod_security2\standalone\Debug\msc_pcre.obj +c:\work\mod_security2\standalone\Debug\msc_release.obj +c:\work\mod_security2\standalone\Debug\msc_reqbody.obj +c:\work\mod_security2\standalone\Debug\msc_tree.obj +c:\work\mod_security2\standalone\Debug\msc_unicode.obj +c:\work\mod_security2\standalone\Debug\msc_util.obj +c:\work\mod_security2\standalone\Debug\msc_xml.obj +c:\work\mod_security2\standalone\Debug\persist_dbm.obj +c:\work\mod_security2\standalone\Debug\re.obj +c:\work\mod_security2\standalone\Debug\regex.obj +c:\work\mod_security2\standalone\Debug\re_actions.obj +c:\work\mod_security2\standalone\Debug\re_operators.obj +c:\work\mod_security2\standalone\Debug\re_tfns.obj +c:\work\mod_security2\standalone\Debug\re_variables.obj +c:\work\mod_security2\standalone\Debug\server.obj +c:\work\mod_security2\standalone\Debug\cl.command.1.tlog +c:\work\mod_security2\standalone\Debug\CL.read.1.tlog +c:\work\mod_security2\standalone\Debug\CL.write.1.tlog +c:\work\mod_security2\standalone\Debug\link-cvtres.read.1.tlog +c:\work\mod_security2\standalone\Debug\link-cvtres.write.1.tlog +c:\work\mod_security2\standalone\Debug\link-rc.read.1.tlog +c:\work\mod_security2\standalone\Debug\link-rc.write.1.tlog +c:\work\mod_security2\standalone\Debug\link.command.1.tlog +c:\work\mod_security2\standalone\Debug\link.read.1.tlog +c:\work\mod_security2\standalone\Debug\link.write.1.tlog +c:\work\mod_security2\standalone\Debug\standalone.exp +c:\work\mod_security2\standalone\Debug\vc110.idb +c:\work\mod_security2\standalone\Debug\standalone.pdb +c:\work\mod_security2\standalone\Debug\vc110.pdb +C:\work\mod_security2\standalone\Debug\standalone.pdb diff --git a/standalone/Debug/standalone.exp b/standalone/Debug/standalone.exp new file mode 100644 index 00000000..c4871df5 Binary files /dev/null and b/standalone/Debug/standalone.exp differ diff --git a/standalone/Debug/standalone.lastbuildstate b/standalone/Debug/standalone.lastbuildstate new file mode 100644 index 00000000..9fe15e06 --- /dev/null +++ b/standalone/Debug/standalone.lastbuildstate @@ -0,0 +1,2 @@ +#v4.0:v110:false +Debug|Win32|C:\work\mod_security2\standalone\| diff --git a/standalone/Debug/standalone.lib b/standalone/Debug/standalone.lib new file mode 100644 index 00000000..dcb76f1f Binary files /dev/null and b/standalone/Debug/standalone.lib differ diff --git a/standalone/Debug/standalone.log b/standalone/Debug/standalone.log new file mode 100644 index 00000000..f34f525d --- /dev/null +++ b/standalone/Debug/standalone.log @@ -0,0 +1,90 @@ +Build started 8/23/2013 12:59:45 PM. + 1>Project "c:\work\mod_security2\standalone\standalone.vcxproj" on node 2 (Build target(s)). + 1>ClCompile: + C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\bin\CL.exe /c /I"C:\work\pcre-8.30\include" /I"C:\work\pcre-8.30" /I"C:\work\libxml2-2.7.7\include" /IC:\apache22\include /I..\apache2 /Ic:\work\apache24\include /ZI /nologo /W3 /WX- /Od /Oy- /D _MBCS /D _MBCS /D WIN32 /D WINNT /D inline=APR_INLINE /D AP_DECLARE_STATIC /D VERSION_STANDALONE /Gm /EHsc /RTC1 /MDd /GS /fp:precise /Zc:wchar_t /Zc:forScope /Fo"Debug\\" /Fd"Debug\vc110.pdb" /Gd /TC /wd4244 /wd4018 /analyze- /errorReport:prompt ..\apache2\acmp.c ..\apache2\apache2_config.c ..\apache2\apache2_io.c ..\apache2\apache2_util.c ..\apache2\modsecurity.c ..\apache2\mod_security2.c ..\apache2\msc_crypt.c ..\apache2\msc_geo.c ..\apache2\msc_gsb.c ..\apache2\msc_logging.c ..\apache2\msc_lua.c ..\apache2\msc_multipart.c ..\apache2\msc_parsers.c ..\apache2\msc_pcre.c ..\apache2\msc_release.c ..\apache2\msc_reqbody.c ..\apache2\msc_tree.c ..\apache2\msc_unicode.c ..\apache2\msc_util.c ..\apache2\msc_xml.c ..\apache2\persist_dbm.c ..\apache2\re.c ..\apache2\re_actions.c ..\apache2\re_operators.c ..\apache2\re_tfns.c ..\apache2\re_variables.c api.c buckets.c config.c filters.c hooks.c regex.c server.c + server.c + regex.c + hooks.c + filters.c + config.c + buckets.c + api.c + 1>c:\work\mod_security2\standalone\api.c(226): warning C4101: 'rc' : unreferenced local variable + re_variables.c + re_tfns.c + re_operators.c + re_actions.c + re.c + persist_dbm.c + msc_xml.c + msc_util.c + msc_unicode.c + msc_tree.c + msc_reqbody.c + msc_release.c + msc_pcre.c + Generating Code... + Compiling... + msc_parsers.c + msc_multipart.c + msc_lua.c + msc_logging.c + msc_gsb.c + msc_geo.c + msc_crypt.c + 1>c:\work\mod_security2\apache2\msc_crypt.c(70): warning C4101: 'i' : unreferenced local variable + mod_security2.c + modsecurity.c + apache2_util.c + apache2_io.c + apache2_config.c + acmp.c + Generating Code... + C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\bin\CL.exe /c /I"C:\work\pcre-8.30\include" /I"C:\work\pcre-8.30" /I"C:\work\libxml2-2.7.7\include" /IC:\apache22\include /I..\apache2 /Ic:\work\apache24\include /ZI /nologo /W3 /WX- /Od /Oy- /D _MBCS /D _MBCS /D WIN32 /D WINNT /D inline=APR_INLINE /D AP_DECLARE_STATIC /D VERSION_STANDALONE /Gm /EHsc /RTC1 /MDd /GS /fp:precise /Zc:wchar_t /Zc:forScope /Fo"Debug\\" /Fd"Debug\vc110.pdb" /Gd /TP /wd4244 /wd4018 /analyze- /errorReport:prompt main.cpp + main.cpp + 1>c:\work\mod_security2\standalone\main.cpp(16): warning C4005: 'inline' : macro redefinition + command-line arguments : see previous definition of 'inline' + Link: + C:\Program Files (x86)\Microsoft Visual Studio 11.0\VC\bin\link.exe /ERRORREPORT:PROMPT /OUT:"C:\work\mod_security2\standalone\Debug\standalone.exe" /INCREMENTAL /NOLOGO /LIBPATH:c:\drop\x86 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib "libapr-1.lib" "libaprutil-1.lib" pcre.lib libxml2.lib /MANIFEST /MANIFESTUAC:"level='asInvoker' uiAccess='false'" /manifest:embed /DEBUG /PDB:"C:\work\mod_security2\standalone\Debug\standalone.pdb" /SUBSYSTEM:CONSOLE /TLBID:1 /DYNAMICBASE /NXCOMPAT /IMPLIB:"C:\work\mod_security2\standalone\Debug\standalone.lib" /MACHINE:X86 Debug\acmp.obj + Debug\apache2_config.obj + Debug\apache2_io.obj + Debug\apache2_util.obj + Debug\modsecurity.obj + Debug\mod_security2.obj + Debug\msc_crypt.obj + Debug\msc_geo.obj + Debug\msc_gsb.obj + Debug\msc_logging.obj + Debug\msc_lua.obj + Debug\msc_multipart.obj + Debug\msc_parsers.obj + Debug\msc_pcre.obj + Debug\msc_release.obj + Debug\msc_reqbody.obj + Debug\msc_tree.obj + Debug\msc_unicode.obj + Debug\msc_util.obj + Debug\msc_xml.obj + Debug\persist_dbm.obj + Debug\re.obj + Debug\re_actions.obj + Debug\re_operators.obj + Debug\re_tfns.obj + Debug\re_variables.obj + Debug\api.obj + Debug\buckets.obj + Debug\config.obj + Debug\filters.obj + Debug\hooks.obj + Debug\main.obj + Debug\regex.obj + Debug\server.obj + Creating library C:\work\mod_security2\standalone\Debug\standalone.lib and object C:\work\mod_security2\standalone\Debug\standalone.exp + 1>re_operators.obj : error LNK2019: unresolved external symbol _libinjection_sqli_init referenced in function _msre_op_detectSQLi_execute + 1>re_operators.obj : error LNK2019: unresolved external symbol _libinjection_is_sqli referenced in function _msre_op_detectSQLi_execute + 1>C:\work\mod_security2\standalone\Debug\standalone.exe : fatal error LNK1120: 2 unresolved externals + 1>Done Building Project "c:\work\mod_security2\standalone\standalone.vcxproj" (Build target(s)) -- FAILED. + +Build FAILED. + +Time Elapsed 00:00:15.65 diff --git a/standalone/Debug/standalone.pdb b/standalone/Debug/standalone.pdb new file mode 100644 index 00000000..56cb15db Binary files /dev/null and b/standalone/Debug/standalone.pdb differ diff --git a/standalone/Debug/standalone.unsuccessfulbuild b/standalone/Debug/standalone.unsuccessfulbuild new file mode 100644 index 00000000..e69de29b diff --git a/standalone/Debug/vc110.idb b/standalone/Debug/vc110.idb new file mode 100644 index 00000000..e51b8fec Binary files /dev/null and b/standalone/Debug/vc110.idb differ diff --git a/standalone/Debug/vc110.pdb b/standalone/Debug/vc110.pdb new file mode 100644 index 00000000..023ecaec Binary files /dev/null and b/standalone/Debug/vc110.pdb differ diff --git a/standalone/libapr-1.lib b/standalone/libapr-1.lib new file mode 100644 index 00000000..01b91dd0 Binary files /dev/null and b/standalone/libapr-1.lib differ diff --git a/standalone/libaprutil-1.lib b/standalone/libaprutil-1.lib new file mode 100644 index 00000000..799ec37a Binary files /dev/null and b/standalone/libaprutil-1.lib differ diff --git a/standalone/libxml2.lib b/standalone/libxml2.lib new file mode 100644 index 00000000..485869d1 Binary files /dev/null and b/standalone/libxml2.lib differ diff --git a/standalone/pcre.lib b/standalone/pcre.lib new file mode 100644 index 00000000..17270cee Binary files /dev/null and b/standalone/pcre.lib differ diff --git a/standalone/standalone.sdf b/standalone/standalone.sdf new file mode 100644 index 00000000..217db991 Binary files /dev/null and b/standalone/standalone.sdf differ diff --git a/standalone/standalone.v11.suo b/standalone/standalone.v11.suo new file mode 100644 index 00000000..d6ee1f37 Binary files /dev/null and b/standalone/standalone.v11.suo differ diff --git a/standalone/standalone.vcxproj b/standalone/standalone.vcxproj index 5e4bd8ef..8179b0e0 100644 --- a/standalone/standalone.vcxproj +++ b/standalone/standalone.vcxproj @@ -70,7 +70,7 @@ Level3 Disabled - C:\work\pcre-8.30\include;C:\work\pcre-8.30;C:\work\libxml2-2.7.7\include;C:\apache22\include;..\apache2;c:\work\httpd-2.2.24\include + C:\work\pcre-8.30\include;C:\work\pcre-8.30;C:\work\libxml2-2.7.7\include;C:\apache22\include;..\apache2;c:\work\apache24\include _MBCS;%(PreprocessorDefinitions);WIN32;WINNT;inline=APR_INLINE;AP_DECLARE_STATIC;VERSION_STANDALONE 4244;4018 @@ -78,6 +78,7 @@ true kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;%(AdditionalDependencies);libapr-1.lib;libaprutil-1.lib;pcre.lib;libxml2.lib c:\drop\x86 + Console