From e502b7cb50a8b9c3513d1d3a1c0cd386079f2ae3 Mon Sep 17 00:00:00 2001 From: Corey Harding Date: Fri, 16 Mar 2018 11:25:23 -0400 Subject: [PATCH] Release v1.1.6 - Add Json API API V1.0.0 --- Source Code/esprfidtool/api.h | 1 + Source Code/esprfidtool/api_server.h | 16 ++++++++++++---- Source Code/esprfidtool/esprfidtool.ino | 18 +++++++++++++++++- 3 files changed, 30 insertions(+), 5 deletions(-) diff --git a/Source Code/esprfidtool/api.h b/Source Code/esprfidtool/api.h index 8643b24..600c88d 100644 --- a/Source Code/esprfidtool/api.h +++ b/Source Code/esprfidtool/api.h @@ -64,6 +64,7 @@ void apilistlogs(int prettify) { String FileName = dir2ndrun.fileName(); if ((!FileName.startsWith("/payloads/"))&&(!FileName.startsWith("/esploit.json"))&&(!FileName.startsWith("/esportal.json"))&&(!FileName.startsWith("/esprfidtool.json"))&&(!FileName.startsWith("/config.json"))) { currentlog++; + FileName.remove(0,1); JsonObject& apilistlogs = apilog.createNestedObject(String(currentlog)); apilistlogs["File Name"]=FileName; } diff --git a/Source Code/esprfidtool/api_server.h b/Source Code/esprfidtool/api_server.h index 0260669..c433161 100644 --- a/Source Code/esprfidtool/api_server.h +++ b/Source Code/esprfidtool/api_server.h @@ -1,12 +1,20 @@ server.on("/api/help", [](){ - String apihelpHTML=F( + String apihelpHTML=String()+F( "<- BACK TO INDEX

" - "/api/info
" + "API Version: " + )+APIversion+F( + "

" + "/api/info
" "Usage: [server]/api/info
" - "/api/viewlog
" + "
" + "/api/viewlog
" "Usage: [server]/api/viewlog?logfile=[log.txt]
" - "/api/listlogs
" + "
" + "/api/listlogs
" "Usage: [server]/api/listlogs
" + "
" "Optional Arguments
" "Prettify: [api-url]?[args]&prettify=1
" ); diff --git a/Source Code/esprfidtool/esprfidtool.ino b/Source Code/esprfidtool/esprfidtool.ino index f0375dc..ab6fe00 100644 --- a/Source Code/esprfidtool/esprfidtool.ino +++ b/Source Code/esprfidtool/esprfidtool.ino @@ -1027,7 +1027,23 @@ void setup() { used=fs_info.usedBytes; String freespace; freespace=fs_info.totalBytes-fs_info.usedBytes; - server.send(200, "text/html", String()+F("ESP-RFID-Tool v")+version+F("

by Corey Harding
www.RFID-Tool.com
www.LegacySecurityGroup.com / www.Exploit.Agency
-----
File System Info Calculated in Bytes
Total: ")+total+" Free: "+freespace+" "+" Used: "+used+F("
-----
List Exfiltrated Data
-
Experimental TX Mode
-
Data Conversion Tools
-
Configure Settings
-
Format File System
-
Upgrade Firmware
-
Help")); + server.send(200, "text/html", String()+F("ESP-RFID-Tool v")+version+F("
" + "
" + "by Corey Harding
" + "www.RFID-Tool.com
" + "www.LegacySecurityGroup.com / www.Exploit.Agency
" + "-----
" + "File System Info Calculated in Bytes
" + "Total: ")+total+" Free: "+freespace+" "+" Used: "+used+F("
-----
" + "List Exfiltrated Data
-
" + "Experimental TX Mode
-
" + "Data Conversion Tools
-
" + "Configure Settings
-
" + "Format File System
-
" + "Upgrade Firmware
-
" + "API Info
-
" + "Help" + "")); }); server.onNotFound([]() {