Merge branch 'dev'

Author: hugsy

cmake/FindPolarSSL.cmake

@@ -24,11 +24,10 @@ if(NOT ${POLARSSL_LIBRARIES})
   find_library(POLARSSL_LIBRARIES NAMES polarssl)
 endif()
 
-find_package_handle_standard_args(POLARSSL REQUIRED_VARS
-  POLARSSL_INCLUDE_DIR POLARSSL_LIBRARIES)
+find_package_handle_standard_args(POLARSSL REQUIRED_VARS POLARSSL_INCLUDE_DIR POLARSSL_LIBRARIES)
 
-if(!POLARSSL_INCLUDE_DIR AND !POLARSSL_LIBRARIES)
-  message(FATAL_ERROR "Cannot find PolarSSL library")
+if( ${POLARSSL_LIBRARIES-NOTFOUND} )
+  message(FATAL_ERROR "Failed to get info from PolarSSL library, check your PolarSSL installation")
   set(POLARSSL_FOUND False)
   return()
 endif()

config.h.in

@@ -39,6 +39,7 @@
 #define CFG_RESPONSE_PLUGIN_FUNCTION         "proxenet_response_hook"   // default name for hooking response function
 #define CFG_DEFAULT_SSL_CLIENT_DOMAIN        "*"                        // default domain to use the SSL client certificate (* means any)
 #define CFG_DEFAULT_INTERCEPT_PATTERN        "*"                        // default pattern to intercept (all)
+#define CFG_CONTROL_SOCK_PATH                "/tmp/proxenet-control-socket"
 
 
 /********************************************************************************

control-client.py

@@ -2,12 +2,7 @@
 # -*- coding: utf-8 -*-
 # -*- mode: python -*-
 
-import argparse
-import socket
-import datetime
-import os
-import rlcompleter
-import readline
+import argparse, socket, datetime, os, json, rlcompleter, readline, pprint
 
 
 __author__    =   "hugsy"
@@ -20,7 +15,7 @@
 syntax: {3} [options] args
 """.format(__version__, __licence__, __author__, __file__)
 
-# the socket path can be modified in control-server.h
+# the socket path can be modified in config.h.in
 PROXENET_SOCKET_PATH = "/tmp/proxenet-control-socket"
 
 def now():
@@ -84,7 +79,19 @@ def recv_until(sock, pattern=">>> "):
                 recv_until(cli)
                 break
 
-            cmd = raw_input( recv_until(cli) )
+            res = recv_until(cli)
+            data, prompt = res[:-4], res[-4:]
+            try:
+                js = json.loads( data )
+                for k,v in js.iteritems():
+                    if v.__class__.__name__ == "dict":
+                        print("{}".format(k))
+                        for a,b in v.iteritems(): print("\t{} -> {}".format(a,b))
+                    else:
+                        print("{} -> {}".format(k,v))
+            except:
+                print(data)
+            cmd = raw_input( prompt )
             cli.send(cmd.strip()+"\n")
             if cmd.strip() == "quit":
                 do_loop = False