Release v1.1.6 - Add Json API

API V1.0.0
rfidtool · Mar 16, 2018 · e502b7c · e502b7c
1 parent a67d0dd
commit e502b7c
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 5 deletions.
diff --git 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
@@ -1,12 +1,20 @@
 server.on("/api/help", [](){
- String apihelpHTML=F(
+ String apihelpHTML=String()+F(
  "<a href=\"/\"><- BACK TO INDEX</a><br><br>"
- "<b>/api/info</b><br>"
+ "<b>API Version: "
+ )+APIversion+F(
+ "</b><br><br>"
+ "<b><a href=\"/api/info?prettify=1\">/api/info</a></b><br>"
  "<small>Usage: [server]/api/info</small><br>"
- "<b>/api/viewlog</b><br>"
+ "<br>"
+ "<b><a href=\"/api/viewlog?logfile="
+ )+logname+F(
+ "&prettify=1\">/api/viewlog</a></b><br>"
  "<small>Usage: [server]/api/viewlog?logfile=[log.txt]</small><br>"
- "<b>/api/listlogs</b><br>"
+ "<br>"
+ "<b><a href=\"/api/listlogs?prettify=1\">/api/listlogs</a></b><br>"
  "<small>Usage: [server]/api/listlogs</small><br>"
+ "<br>"
  "<b>Optional Arguments</b><br>"
  "<small>Prettify: [api-url]?[args]<u>&prettify=1</u></small><br>"
  );