handler: use surveyor

Author: nmattia

infra/default.nix

@@ -13,7 +13,7 @@ rec
   tar -xvf ${pkgs.sources.dynamodb}
   '';
 
-  test = pkgs.runCommand "tests" { buildInputs = [ pkgs.jre pkgs.curl pkgs.netcat pkgs.strace ]; }
+  test = pkgs.runCommand "tests" { buildInputs = [ pkgs.jre pkgs.curl pkgs.netcat pkgs.strace pkgs.dnsmasq pkgs.dnsutils ]; }
   ''
 
       java -Djava.library.path=${dynamoJar}/DynamoDBLocal_lib -jar ${dynamoJar}/DynamoDBLocal.jar -sharedDb -port 8000 &
@@ -24,28 +24,35 @@ rec
       done
       sleep 2
 
+      NIX_REDIRECTS=/etc/hosts=${hostsFile} \
+        LD_PRELOAD="${pkgs.libredirect}/lib/libredirect.so" \
+        dnsmasq -p 8053 &
 
-      ls ${pkgs.otherport}/lib
-
-      strace -f -e trace=network -s 10000 curl dynamodb.us-east-1.coo
+      while ! nc -z 127.0.0.1 8053; do
+        echo waiting for dnsmasq
+        sleep 1
+      done
+      sleep 2
 
-      exit 1
+      SRV_MAP="127.0.0.1:53:127.0.0.1:8053 127.0.0.1:80:127.0.0.1:8000" \
+        LD_PRELOAD="${pkgs.surveyor}/lib/surveyor.so" \
+        strace -f -e trace=network nslookup -port=8053 dynamodb.us-east-1.amazonaws.com
 
       NIX_REDIRECTS=/etc/hosts=${hostsFile} \
-        OLD_PORT=80 NEW_PORT=8000 \
-        LD_PRELOAD="${pkgs.libredirect}/lib/libredirect.so ${pkgs.otherport}/lib/otherport.so" \
-        AWS_DEFAULT_REGION=us-east-1 \
-        AWS_ACCESS_KEY_ID=dummy \
-        AWS_SECRET_ACCESS_KEY=dummy \
-        strace curl dynamodb.us-east-1.amazonaws.com
+        SRV_MAP="127.0.0.1:80:127.0.0.1:8000" \
+        LD_PRELOAD="${pkgs.libredirect}/lib/libredirect.so ${pkgs.surveyor}/lib/surveyor.so" \
+        curl dynamodb.us-east-1.amazonaws.com
+        #strace -f -e trace=file curl dynamodb.us-east-1.amazonaws.com
+
+      exit 1
 
       NIX_REDIRECTS=/etc/hosts=${hostsFile} \
-        OLD_PORT=80 NEW_PORT=8000 \
-        LD_PRELOAD="${pkgs.libredirect}/lib/libredirect.so ${pkgs.otherport}/lib/otherport.so" \
+        SRV_MAP="127.0.0.1:80:127.0.0.1:8000" \
+        LD_PRELOAD="${pkgs.libredirect}/lib/libredirect.so ${pkgs.surveyor}/lib/surveyor.so" \
         AWS_DEFAULT_REGION=us-east-1 \
         AWS_ACCESS_KEY_ID=dummy \
         AWS_SECRET_ACCESS_KEY=dummy \
-        ${handler}/bin/server &
+        strace -f -e trace=network ${handler}/bin/server &
 
       while ! nc -z 127.0.0.1 8080; do
         echo waiting for warp

infra/nix/default.nix

@@ -3,6 +3,7 @@ with rec
 { sources = import ./sources.nix;
   pkgs = import sources.nixpkgs {};
   wai-lambda = pkgs.callPackage "${sources.wai-lambda}/nix/packages.nix" {};
+  surveyor = pkgs.callPackage ../surveyor {};
 
   pkgsStatic =
     (import "${sources.static-haskell-nix}/survey"
@@ -41,9 +42,6 @@ with rec
 
 pkgs //
 { inherit haskellPackagesStatic haskellPackages sources wai-lambda;
+  inherit (surveyor) surveyor;
   inherit (import sources.niv {}) niv;
-  otherport = pkgs.stdenv.mkDerivation
-    { name = "otherport"; src = sources.otherport;
-      installPhase = "mkdir -p $out/lib && cp otherport.so $out/lib";
-    } ;
 }

infra/nix/sources.json

@@ -26,18 +26,6 @@
         "type": "file",
         "sha256": "0hrwxg4igyll40y7l1s0icg55g247fl8cjs4rrcpjf8d7m0bb09j"
     },
-    "otherport": {
-        "homepage": "",
-        "url": "https://github.com/FiloSottile/otherport/archive/9d67c3619c457e5f663a789ee7fd29295cac7870.tar.gz",
-        "owner": "FiloSottile",
-        "branch": "master",
-        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz",
-        "repo": "otherport",
-        "type": "tarball",
-        "sha256": "0553mq6wxhd4zvq73r3b1cp3s52anld099bc4pw9ny4mb20hrhm3",
-        "description": "LD_PRELOAD hack to redirect connections to other ports",
-        "rev": "9d67c3619c457e5f663a789ee7fd29295cac7870"
-    },
     "static-haskell-nix": {
         "homepage": "",
         "url": "https://github.com/nh2/static-haskell-nix/archive/9781df8a48eade302d159ce63a7ab0c30247788c.tar.gz",

infra/surveyor/surveyor.c

@@ -97,7 +97,7 @@ void _init(void)
     {
         int res;
 
-        fprintf(stderr, "Parsing mapping %d \n", n_mappings);
+        fprintf(stderr, "Parsing mapping %d \n", i+1);
 
         pch = strtok(mappings_strs[i], ":");
         if(pch == NULL){ exit(43); }