diff --git a/poc/cli.py b/poc/cli.py index f2353a6..f62fcd2 100644 --- a/poc/cli.py +++ b/poc/cli.py @@ -56,6 +56,9 @@ def version_state(ver): def cmd_check(args): name = args.name + reach = "" + if getattr(args, "url", ""): + reach = "yes" if require_target(args.host, args.port, args.tls, args.insecure) else "no" vtext = dkr(["exec", name, "php", "-v"]) ver = parse_version(vtext) info = dkr(["exec", name, "php", "-i"]) @@ -80,10 +83,13 @@ def cmd_check(args): rows.append(("libphp_sha256", sha or "?", "")) rows.append(("profile", prof_name or "NO PROFILE MATCH", "")) rows.append(("workers", workers, "")) + if reach: + rows.append(("reachable", reach, "")) ok = state == "vulnerable" and prof is not None if args.json: - print(json.dumps({"vulnerable": ok, "version": ver and "%d.%d.%d" % ver, + print(json.dumps({"vulnerable": ok, "reachable": reach or None, + "version": ver and "%d.%d.%d" % ver, "state": state, "libphp_sha256": sha, "profile": prof_name, "ini": ini, "workers": workers}, indent=2)) else: @@ -447,7 +453,11 @@ def build_parser(): p = sub.add_parser("check") common(p) - p.set_defaults(func=cmd_check) + p.add_argument("--url", default="") + p.add_argument("--path", default="") + p.add_argument("--tls", action="store_true") + p.add_argument("--insecure", action="store_true") + p.set_defaults(func=cmd_check, resolve=True) p = sub.add_parser("leak") common(p)