From ad8cda7716fef9e2bbe590a0ea56ae372e22eb0b Mon Sep 17 00:00:00 2001 From: Peter van Dijk Date: Mon, 26 Nov 2018 16:26:52 +0100 Subject: [PATCH] geoip: store binary blobs instead of base64 sources --- .gitignore | 2 - .../regression-tests/GeoLiteCity.dat | Bin 0 -> 638 bytes .../regression-tests/GeoLiteCity.dat.b64 | 12 ------ .../regression-tests/GeoLiteCity.mmdb | Bin 0 -> 1950 bytes .../regression-tests/GeoLiteCity.mmdb.b64 | 35 ------------------ regression-tests.auth-py/runtests | 5 --- regression-tests/backends/geoip-master | 3 -- 7 files changed, 57 deletions(-) create mode 100644 modules/geoipbackend/regression-tests/GeoLiteCity.dat delete mode 100644 modules/geoipbackend/regression-tests/GeoLiteCity.dat.b64 create mode 100644 modules/geoipbackend/regression-tests/GeoLiteCity.mmdb delete mode 100644 modules/geoipbackend/regression-tests/GeoLiteCity.mmdb.b64 diff --git a/.gitignore b/.gitignore index 4a0fbce403..3823101c71 100644 --- a/.gitignore +++ b/.gitignore @@ -49,6 +49,4 @@ pdns_recursor.pid *.gcda *.gcno *.gcov -modules/geoipbackend/regression-tests/GeoLiteCity.dat -modules/geoipbackend/regression-tests/GeoLiteCity.mmdb built_pkgs diff --git a/modules/geoipbackend/regression-tests/GeoLiteCity.dat b/modules/geoipbackend/regression-tests/GeoLiteCity.dat new file mode 100644 index 0000000000000000000000000000000000000000..552a992db5b008858db669a7e775e0c05810ae93 GIT binary patch literal 638 zc-l?RM@|A^7>Dt{*cBCf!HT^h%!q)Bf@2p1%LObfR3b(}<4RBA(nGj*?ao8E^8{>h zd=jFQH@`gdPQK)uGU-Sfk{m=iR$wJoVKvrBwL~4(qZ1pj5u4D3&Desi*oN)cft}ce z-PnU}?8QFp#{p@OIF>G@XUW6sFpl6Tj-fr{(gZPyQ#g$?IE!8>O3X<Dcz}ncgTMb? zi2G&v<+C5Zq7QC+Bo*R@EQ77_e{0Gz*_wY_SJF}Pxt@; literal 0 Hc-jL100001 diff --git a/modules/geoipbackend/regression-tests/GeoLiteCity.dat.b64 b/modules/geoipbackend/regression-tests/GeoLiteCity.dat.b64 deleted file mode 100644 index 55667404dc..0000000000 --- a/modules/geoipbackend/regression-tests/GeoLiteCity.dat.b64 +++ /dev/null @@ -1,12 +0,0 @@ -AQAAUwAAIQAAAgAAUwAAAwAAUwAABAAAUwAABQAAUwAABgAAUwAABwAAUwAACAAACQAAUwAACgAA -UwAACwAAUwAADAAAUwAADQAAUwAADgAAUwAADwAAUwAAEAAAUwAAEQAAUwAAEgAAUwAAEwAAUwAA -FAAAUwAAFQAAUwAAFgAAUwAAFwAAUwAAGAAAUwAAGQAAUwAAGgAAUwAAGwAAUwAAHAAAUwAAHQAA -UwAAHgAAUwAAHwAAIAAAUwAAVAAAagAAgAAAIgAAUwAAIwAAUwAAJAAAUwAAJQAAUwAAJgAAUwAA -UwAAJwAAKAAAUwAAKQAAUwAAKgAAUwAAKwAAUwAALAAAUwAALQAAUwAALgAAQAAAUwAALwAAMAAA -UwAAMQAAUwAAMgAAUwAAMwAAUwAANAAAUwAANQAAUwAANgAANwAAUwAAlgAAOAAAUwAAOQAAUwAA -OgAAUwAAOwAAUwAAPAAAUwAAPQAAUwAAPgAAUwAAPwAAUwAAlgAAUwAAQQAAUwAAQgAAUwAAQwAA -UwAARAAAUwAARQAAUwAARgAAUwAARwAASQAAUwAASAAAUwAAsgAASgAAUwAASwAAUwAATAAAUwAA -TQAAUwAATgAAUwAATwAAUwAAUAAAUwAAUQAAUwAAUgAAUwAAsgAAUwAAKvZMMQBDMQAwMDAwMQBA -dxtAdxsAAAD2TDIAQzIAMDAwMDIAQHcbQHcbAAAA9kwzAEMzADAwMDAzAEB3G0B3GwAAABBPQwBN -ZWxib3VybmUAMzA5NQBQnhtQnhsAAADhTkEATXVraWx0ZW8AOTgyNzUAvMYi6M0IPX8MY3N2MmRh -dC5wef///wJTAAA= diff --git a/modules/geoipbackend/regression-tests/GeoLiteCity.mmdb b/modules/geoipbackend/regression-tests/GeoLiteCity.mmdb new file mode 100644 index 0000000000000000000000000000000000000000..2ef58894c49f23805e26086c78c5da6b43d74736 GIT binary patch literal 1950 zc-m#uNo-q19LMozCzP$wQ1;T&DN9+?kc53}BI|I3P|u`x_@pu`GQ&GymWG=RJ*VSqaOs zW-TiTEzk-Vz%sZHE`p2U61WtW!)0(etbjJS0#?G6a1~q)*TA)K9b6Bq;09O?Yv4v$ z3j)@`O>i^Z0=L3?xD9THJK#>Z3+{$?*Z>`H4|GBobi=)HAKVWQz=QA*JPeP(qwp9! z4jW+;^gs%Fp$|607U+jG48R}^K?brg3^~{ePrx=9fl(NPC*dg=ho@mX?0{!r0(OE8 z&w_+}%*&SLFmge`E+|0!wThOd8SREiC_x!KFfr5QDwg#elRg9xLIhK=XR+TmmQ`gm z1JApTZIN3_gc1;7j-_<|zLreO5B=o;+op_c=E%qtJM!Y@)ypszIpAwilK2%0JO| zXd?0dMdKHwr)OlSjh7i!K`2I5Nllt^pQFR-*};M`o-8X{yC=oz^_%OzgEJ}RrMIa- zN#7|BIK~ULr@XM%=NMO|a=l{fN!#xbcD=4Y=cu@W>~~D$g?_abFRuNzEv*A%H_Cg) zC>-dCg3y;GEz>3AG|p4YNymwN=~QiBx;hHx66sRB5=O2nZv2xc9w-^FuypF2NSs*y zk64p!JkPKS_ZWXN5QAsq-s1;X(l4EjCUq%PM))*O!nqPXC{d9uAb6C{NzERwONvBmSjZd{7%W{PF?JjT)I=& zy6=hC=QCXk@vixJOEcb0yk%*;yBV*~XSx^S-Cv*jBP*w~+H*HJru_Sky!NDDwRai6 zEJM32cN^cHQhxpXbIJ2pwYRuBJCu)f$+cC*IK|fF_S5_S&AKv_c^N1>tX5Q}Uzy(c z`n6}`cRb{(!0~mZek1Bf8Oa)FQpERCS41;4s4EMtmkpGpSBPXm#cwgLAN1mDW;d?i S@!26?ImUPGK+mYT)&BuHKh!t? literal 0 Hc-jL100001 diff --git a/modules/geoipbackend/regression-tests/GeoLiteCity.mmdb.b64 b/modules/geoipbackend/regression-tests/GeoLiteCity.mmdb.b64 deleted file mode 100644 index 60da132432..0000000000 --- a/modules/geoipbackend/regression-tests/GeoLiteCity.mmdb.b64 +++ /dev/null @@ -1,35 +0,0 @@ -AAABAAAAoAAAAgAAAKAAAAMAAACgAAAEAAAAoAAABQAAAKAAAAYAAACgAAAHAAAAoAAACAAAAKAA -AAkAAACgAAAKAAAAoAAACwAAAKAAAAwAAACgAAANAAAAoAAADgAAAKAAAA8AAACgAAAQAAAAoAAA -EQAAAKAAABIAAACgAAATAAAAoAAAFAAAAKAAABUAAACgAAAWAAAAoAAAFwAAAKAAABgAAACgAAAZ -AAAAoAAAGgAAAKAAABsAAACgAAAcAAAAoAAAHQAAAKAAAB4AAACgAAAfAAAAoAAAIAAAAKAAACEA -AACgAAAiAAAAoAAAIwAAAKAAACQAAACgAAAlAAAAoAAAJgAAAKAAACcAAACgAAAoAAAAoAAAKQAA -AKAAACoAAACgAAArAAAAoAAALAAAAKAAAC0AAACgAAAuAAAAoAAALwAAAKAAADAAAACgAAAxAAAA -oAAAMgAAAKAAADMAAACgAAA0AAAAoAAANQAAAKAAADYAAACgAAA3AAAAoAAAOAAAAKAAADkAAACg -AAA6AAAAoAAAOwAAAKAAADwAAACgAAA9AAAAoAAAPgAAAKAAAD8AAACgAABAAAAAoAAAQQAAAKAA -AEIAAACgAABDAAAAoAAARAAAAKAAAEUAAACgAABGAAAAoAAARwAAAKAAAEgAAACgAABJAAAAoAAA -SgAAAKAAAEsAAACgAABMAAAAoAAATQAAAKAAAE4AAACgAABPAAAAoAAAUAAAAKAAAFEAAACgAABS -AAAAoAAAUwAAAKAAAFQAAACgAABVAAAAoAAAVgAAAKAAAFcAAACgAABYAAAAoAAAWQAAAKAAAFoA -AACgAABbAAAAoAAAXAAAAKAAAF0AAACgAABeAAAAoAAAXwAAAKAAAGAAAACgAABhAAAAoAAAYgAA -AIEAAGMAAACgAABkAAAAoAAAZQAAAKAAAGYAAACgAABnAAAAoAAAoAAAAGgAAGkAAACgAABqAAAA -oAAAawAAAKAAAGwAAACgAABtAAAAoAAAbgAAAKAAAG8AAAB4AACgAAAAcAAAcQAAAKAAAHIAAACg -AABzAAAAoAAAdAAAAKAAAHUAAACgAAB2AAAAoAAAdwAAAKAAAKAAAACwAAB5AAAAoAAAegAAAKAA -AHsAAACgAAB8AAAAoAAAfQAAAKAAAH4AAACgAAB/AAAAoAAAoAAAAIAAAKAAAAG1AACgAAAAggAA -oAAAAIMAAKAAAACEAACgAAAAhQAAoAAAAIYAAKAAAACHAACIAAAAoAAAiQAAAKAAAIoAAACgAACL -AAAAoAAAjAAAAKAAAI0AAACgAACOAAAAoAAAjwAAAKAAAJAAAACgAACRAAAAoAAAkgAAAKAAAJMA -AACgAACUAAAAoAAAlQAAAKAAAJYAAACgAACXAAAAoAAAmAAAAKAAAJkAAACgAACaAAAAoAAAmwAA -AKAAAJwAAACgAACdAAAAoAAAngAAAJ8AAKAAAAJEAAKOAAACzQAAAAAAAAAAAAAAAAAAAADmWGF1 -dG9ub21vdXNfc3lzdGVtX251bWJlcsIQkl0BYXV0b25vbW91c19zeXN0ZW1fb3JnYW5pemF0aW9u -TFRlc3QgVGVsZWtvbURjaXR54kpnZW9uYW1lX2lkwyDVJkVuYW1lc+FCZW5IUmVzZWFyY2hJY29u -dGluZW5040Rjb2RlQk9DIFDDX3IvIF/hQmVuR09jZWFuaWFHY291bnRyeeMgUMMfsxBIaXNvX2Nv -ZGVCQVUgX+FCZW5JQXVzdHJhbGlhSGxvY2F0aW9u409hY2N1cmFjeV9yYWRpdXOhAUhsYXRpdHVk -ZWg/8AAAAAAAAElsb25naXR1ZGVoP/AAAAAAAADmIAHCDPggHU1UZXN0IE5ldHdvcmtzIEriIFDD -WJESIF/hQmVuSE11a2lsdGVvIHLjIH1CTkEgUMNfci0gX+FCZW5NTm9ydGggQW1lcmljYSCZ4yBQ -w19l4SCoQlVTIF/hQmVuTVVuaXRlZCBTdGF0ZXMgxOMgzqEBIOBoQEf03S8an74g8mjAXpN4A0bc -XeMgSuIgUMEBIF/hQmVuQkMxIJnjIFDBASCoQk8xIF/hQmVuQ08gMUxzdWJkaXZpc2lvbnMBBOMg -UMEBIKhCTDEgX+FCZW5DTCAx4yBK4iBQwQIgX+FCZW5CQzIgmeMgUMECIKhCTzEgX+FCZW5DTyAy -IbsBBOMgUMECIKhCTDIgX+FCZW5DTCAy4yBK4iBQwQMgX+FCZW5CQzMgmeMgUMEDIKhCTzEgX+FC -ZW5DTyAzIbsBBOMgUMEDIKhCTDMgX+FCZW5DTCAzq83vTWF4TWluZC5jb23pW2JpbmFyeV9mb3Jt -YXRfbWFqb3JfdmVyc2lvbqECW2JpbmFyeV9mb3JtYXRfbWlub3JfdmVyc2lvbqBLYnVpbGRfZXBv -Y2gEAlrVhPpNZGF0YWJhc2VfdHlwZUxHZW9DaXR5LUxpdGVLZGVzY3JpcHRpb27hQmVuU01vY2sg -Z2VvaXAgZGF0YWJhc2VKaXBfdmVyc2lvbqEGSWxhbmd1YWdlcwEEQmVuSm5vZGVfY291bnTBoEty -ZWNvcmRfc2l6ZaEc diff --git a/regression-tests.auth-py/runtests b/regression-tests.auth-py/runtests index 65e7868c5c..68797ebddc 100755 --- a/regression-tests.auth-py/runtests +++ b/regression-tests.auth-py/runtests @@ -20,11 +20,6 @@ export PDNSUTIL=${PDNSUTIL:-${PWD}/../pdns/pdnsutil} export PREFIX=127.0.0 -readonly GEOIP_TESTS_DIR=../modules/geoipbackend/regression-tests -if [ ! -f ${GEOIP_TESTS_DIR}/GeoLiteCity.mmdb ] ; then - base64 -d ${GEOIP_TESTS_DIR}/GeoLiteCity.mmdb.b64 > ${GEOIP_TESTS_DIR}/GeoLiteCity.mmdb -fi - for bin in "$PDNS" "$PDNSUTIL"; do if [ -n "$bin" -a ! -e "$bin" ]; then echo "E: Required binary $bin not found. Please install the binary and/or edit ./vars." diff --git a/regression-tests/backends/geoip-master b/regression-tests/backends/geoip-master index fe35442ca7..a1c5585ed7 100644 --- a/regression-tests/backends/geoip-master +++ b/regression-tests/backends/geoip-master @@ -83,9 +83,6 @@ EOF geoipkeydir="--geoip-dnssec-keydir=$testsdir/geosec" fi - base64 -d < $testsdir/GeoLiteCity.dat.b64 > $testsdir/GeoLiteCity.dat - base64 -d < $testsdir/GeoLiteCity.mmdb.b64 > $testsdir/GeoLiteCity.mmdb - geoipdatabase=${geoipdatabase:-$testsdir/GeoLiteCity.dat} $RUNWRAPPER $PDNS --daemon=no --local-address=$address --local-port=$port --socket-dir=./ \ -- 2.47.2