Sync embedded yahttp copy

API: Replace HTTP Basic auth with static key in custom header

Given that the key is sent in a custom header, this should prevent
any possible CSRF attacks.

Fixes #1769.

Conflicts:
	pdns/docs/httpapi/README.md
	pdns/docs/httpapi/api_spec.md
	pdns/docs/pdns.xml
	regression-tests.api/runtests.py

Updated:
	pdns/webserver.cc to work with older recursor include files.
	pdns/dist-recursor to reflect changes in paths.
	Includes all yahttp updates from master.
	Disables auth API tests.

Author: zeha

.travis.yml

@@ -52,7 +52,6 @@ script:
  - sleep 3
  - ./clean.sh
  - cd ../regression-tests.api
- - ./runtests authoritative
  - ./runtests recursor
  - cd ../regression-tests
  - touch tests/verify-dnssec-zone/allow-missing

Makefile.am

@@ -1,4 +1,4 @@
-SUBDIRS=modules codedocs @programdescend@
+SUBDIRS=pdns/ext/yahttp modules codedocs @programdescend@
 DIST_SUBDIRS=modules codedocs pdns pdns/ext/rapidjson
 EXTRA_DIST=README HACKING INSTALL NOTICE debian-pdns/* pdns.spec  \
 codedocs/doxygen.conf contrib/powerdns.solaris.init.d \

configure.ac

@@ -33,6 +33,8 @@ AC_PROG_LIBTOOL
 LT_INIT
 ])
 
+MC_TM_GMTOFF
+
 AM_CONDITIONAL([RELEASE_BUILD], [test "$PACKAGE_VERSION" != "git"])
 
 # Define full_libdir to be the fully expanded (${exec_prefix}, etc.)
@@ -320,6 +322,8 @@ AC_CONFIG_FILES([
   pdns/Makefile
   codedocs/Makefile
   pdns/pdns
+  pdns/ext/yahttp/Makefile
+  pdns/ext/yahttp/yahttp/Makefile
   modules/bindbackend/Makefile
   modules/db2backend/Makefile
   modules/geobackend/Makefile

m4/tm-gmtoff.m4

@@ -0,0 +1,13 @@
+dnl Check for the tm_gmtoff field in struct tm
+dnl (Borrowed from the Gaim project)
+
+AC_DEFUN([MC_TM_GMTOFF],
+[AC_REQUIRE([AC_STRUCT_TM])dnl
+AC_CACHE_CHECK([for tm_gmtoff in struct tm], ac_cv_struct_tm_gmtoff,
+[AC_TRY_COMPILE([#include <sys/types.h>
+#include <$ac_cv_struct_tm>], [struct tm tm; tm.tm_gmtoff;],
+  ac_cv_struct_tm_gmtoff=yes, ac_cv_struct_tm_gmtoff=no)])
+if test "$ac_cv_struct_tm_gmtoff" = yes; then
+  AC_DEFINE(HAVE_TM_GMTOFF, 1, [tm_gmtoff is available.])
+fi
+])

pdns/Makefile-recursor

@@ -23,7 +23,7 @@ rec_channel.o rec_channel_rec.o selectmplexer.o sillyrecords.o \
 dns_random.o ext/polarssl-1.3.2/library/aes.o ext/polarssl-1.3.2/library/padlock.o dnslabeltext.o \
 lua-pdns.o lua-recursor.o randomhelper.o recpacketcache.o dns.o \
 reczones.o base32.o nsecrecords.o json.o ws-recursor.o ws-api.o \
-version.o responsestats.o webserver.o ext/yahttp/yahttp/reqresp.o \
+version.o responsestats.o webserver.o ext/yahttp/yahttp/reqresp.o ext/yahttp/yahttp/router.o \
 rec-carbon.o
 
 REC_CONTROL_OBJECTS=rec_channel.o rec_control.o arguments.o misc.o \

pdns/common_startup.cc

@@ -65,6 +65,7 @@ void declareArguments()
   ::arg().set("retrieval-threads", "Number of AXFR-retrieval threads for slave operation")="2";
   ::arg().setSwitch("experimental-json-interface", "If the webserver should serve JSON data")="no";
   ::arg().setSwitch("experimental-api-readonly", "If the JSON API should disallow data modification")="no";
+  ::arg().set("experimental-api-key", "REST API Static authentication key (required for API use)")="";
   ::arg().setSwitch("experimental-dname-processing", "If we should support DNAME records")="no";
 
   ::arg().setCmd("help","Provide a helpful message");

pdns/dist-recursor

@@ -54,6 +54,7 @@ cp config-recursor.h $DIRNAME/config.h
 cat >>$DIRNAME/config.h <<EOF
 #define VERSION "$VERSION"
 #define DIST_HOST "$DIST_HOST"
+#define HAVE_BOOST 1
 EOF
 mkdir -p $DIRNAME/ext/rapidjson/include/rapidjson/internal
 cp -a ext/rapidjson/include/rapidjson/*.h $DIRNAME/ext/rapidjson/include/rapidjson/
@@ -63,6 +64,7 @@ cp -a ext/polarssl-1.3.2/include/polarssl/config.h ext/polarssl-1.3.2/include/po
 mkdir -p $DIRNAME/ext/polarssl-1.3.2/library
 cp -a ext/polarssl-1.3.2/library/aes.c ext/polarssl-1.3.2/library/padlock.c $DIRNAME/ext/polarssl-1.3.2/library
 cp -a ext/yahttp/ $DIRNAME/ext/yahttp
+echo '#include "../../../config.h"' > $DIRNAME/ext/yahttp/yahttp/yahttp-config.h
 mkdir $DIRNAME/rrd
 cp tools/rrd/{create,update,makegraphs,index.html} $DIRNAME/rrd
 cp dnslabeltext.rl $DIRNAME

pdns/ext/yahttp/.gitignore

@@ -1,2 +1,4 @@
 yahttp/libyahttp.a
 *.o
+Makefile
+Makefile.in