lf Bug Fixes and lf demod additions

[proxmark3-svn] / client / cmdscript.c

diff --git a/client/cmdscript.c b/client/cmdscript.c
index b2c892d10b93eda4fc3d5def641292e7f5b53b69..928a216d7334bc72cf52f4b457f12ecbb111683c 100644 (file)
--- a/client/cmdscript.c
+++ b/client/cmdscript.c
@@ -1,11 +1,11 @@
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

-// Copyright (C) 2010 iZsh <izsh at fail0verflow.com>
+// Copyright (C) 2013 m h swende <martin at swende.se>

 //
 // This code is licensed to you under the terms of the GNU GPL, version 2 or,
 // at your option, any later version. See the LICENSE.txt file for the text of
 // the license.
 //-----------------------------------------------------------------------------
 //
 // This code is licensed to you under the terms of the GNU GPL, version 2 or,
 // at your option, any later version. See the LICENSE.txt file for the text of
 // the license.
 //-----------------------------------------------------------------------------

-// Data and Graph commands
+// Some lua scripting glue to proxmark core.

 //-----------------------------------------------------------------------------
 
 #include <stdio.h>
 //-----------------------------------------------------------------------------
 
 #include <stdio.h>


@@ -16,6 +16,7 @@
 #include <dirent.h>
 
 #include "proxmark3.h"
 #include <dirent.h>
 
 #include "proxmark3.h"

+#include "scripting.h"

 #include "data.h"
 #include "ui.h"
 #include "graph.h"
 #include "data.h"
 #include "ui.h"
 #include "graph.h"


@@ -23,13 +24,13 @@
 #include "cmdmain.h"
 #include "cmdscript.h"
 #include "cmdhfmf.h"
 #include "cmdmain.h"
 #include "cmdscript.h"
 #include "cmdhfmf.h"

-
+#include "pm3_binlib.h"
+#include "pm3_bitlib.h"

 #include <lua.h>
 #include <lualib.h>
 #include <lauxlib.h>
 
 
 #include <lua.h>
 #include <lualib.h>
 #include <lauxlib.h>
 
 

-

 static int CmdHelp(const char *Cmd);
 static int CmdList(const char *Cmd);
 static int CmdRun(const char *Cmd);
 static int CmdHelp(const char *Cmd);
 static int CmdList(const char *Cmd);
 static int CmdRun(const char *Cmd);


@@ -37,8 +38,8 @@ static int CmdRun(const char *Cmd);
 command_t CommandTable[] =
 {
   {"help",  CmdHelp, 1, "This help"},
 command_t CommandTable[] =
 {
   {"help",  CmdHelp, 1, "This help"},

-  {"list",  CmdList, 1, "<name> -- List available scripts"},
-  {"run",   CmdRun,  1, "Execute a script"},
+  {"list",  CmdList, 1, "List available scripts"},
+  {"run",   CmdRun,  1, "<name> -- Execute a script"},

   {NULL, NULL, 0, NULL}
 };
 
   {NULL, NULL, 0, NULL}
 };
 


@@ -64,6 +65,7 @@ int str_ends_with(const char * str, const char * suffix) {
 int CmdHelp(const char * Cmd)
 {
     PrintAndLog("This is a feature to run Lua-scripts. You can place lua-scripts within the scripts/-folder. ");
 int CmdHelp(const char * Cmd)
 {
     PrintAndLog("This is a feature to run Lua-scripts. You can place lua-scripts within the scripts/-folder. ");

+    return 0;

 }
 
 /**
 }
 
 /**


@@ -76,9 +78,10 @@ int CmdList(const char *Cmd)
     DIR *dp;
     struct dirent *ep;
     dp = opendir ("./scripts/");
     DIR *dp;
     struct dirent *ep;
     dp = opendir ("./scripts/");

+

     if (dp != NULL)
     {
     if (dp != NULL)
     {

-        while (ep = readdir (dp))
+        while ((ep = readdir (dp)) != NULL)

         {
             if(ep->d_name != NULL && str_ends_with(ep->d_name, ".lua"))
                 PrintAndLog("%-16s %s", ep->d_name, "A script file");
         {
             if(ep->d_name != NULL && str_ends_with(ep->d_name, ".lua"))
                 PrintAndLog("%-16s %s", ep->d_name, "A script file");


@@ -86,7 +89,7 @@ int CmdList(const char *Cmd)
         (void) closedir (dp);
     }
     else
         (void) closedir (dp);
     }
     else

-        PrintAndLog ("Couldn't open the directory");
+        PrintAndLog ("Couldn't open the scripts-directory");

     return 0;
 }
 /**
     return 0;
 }
 /**


@@ -100,126 +103,13 @@ int CmdScript(const char *Cmd)
   CmdsParse(CommandTable, Cmd);
   return 0;
 }
   CmdsParse(CommandTable, Cmd);
   return 0;
 }

-/*
-static int l_hfmf (lua_State *L) {
-    return CmdHFMF("wohoo");
-
-}
-*/
-static int l_CmdHelp(lua_State *L){ return CmdHelp('foo');}
-static int l_CmdHF14AMfDbg(lua_State *L){ return CmdHF14AMfDbg('foo');}
-static int l_CmdHF14AMfRdBl(lua_State *L){ return CmdHF14AMfRdBl('foo');}
-static int l_CmdHF14AMfRdSc(lua_State *L){ return CmdHF14AMfRdSc('foo');}
-static int l_CmdHF14AMfDump(lua_State *L){ return CmdHF14AMfDump('foo');}
-static int l_CmdHF14AMfRestore(lua_State *L){ return CmdHF14AMfRestore('foo');}
-static int l_CmdHF14AMfWrBl(lua_State *L){ return CmdHF14AMfWrBl('foo');}
-static int l_CmdHF14AMfChk(lua_State *L){ return CmdHF14AMfChk('foo');}
-static int l_CmdHF14AMifare(lua_State *L){ return CmdHF14AMifare(luaL_checkstring(L, 1));}
-static int l_CmdHF14AMfNested(lua_State *L){ return CmdHF14AMfNested(luaL_checkstring(L, 1));}
-static int l_CmdHF14AMfSniff(lua_State *L){ return CmdHF14AMfSniff('foo');}
-static int l_CmdHF14AMf1kSim(lua_State *L){ return CmdHF14AMf1kSim('foo');}
-static int l_CmdHF14AMfEClear(lua_State *L){ return CmdHF14AMfEClear('foo');}
-static int l_CmdHF14AMfEGet(lua_State *L){ return CmdHF14AMfEGet('foo');}
-static int l_CmdHF14AMfESet(lua_State *L){ return CmdHF14AMfESet('foo');}
-static int l_CmdHF14AMfELoad(lua_State *L){ return CmdHF14AMfELoad('foo');}
-static int l_CmdHF14AMfESave(lua_State *L){ return CmdHF14AMfESave('foo');}
-static int l_CmdHF14AMfECFill(lua_State *L){ return CmdHF14AMfECFill('foo');}
-static int l_CmdHF14AMfEKeyPrn(lua_State *L){ return CmdHF14AMfEKeyPrn('foo');}
-static int l_CmdHF14AMfCSetUID(lua_State *L){ return CmdHF14AMfCSetUID('foo');}
-static int l_CmdHF14AMfCSetBlk(lua_State *L){ return CmdHF14AMfCSetBlk('foo');}
-static int l_CmdHF14AMfCGetBlk(lua_State *L){ return CmdHF14AMfCGetBlk('foo');}
-static int l_CmdHF14AMfCGetSc(lua_State *L){ return CmdHF14AMfCGetSc('foo');}
-static int l_CmdHF14AMfCLoad(lua_State *L){ return CmdHF14AMfCLoad('foo');}
-static int l_CmdHF14AMfCSave(lua_State *L){ return CmdHF14AMfCSave('foo');}
-
-int luaopen_hfmf(lua_State *L)
-{
-    static const luaL_Reg hfmf_lib[] = {
-        {"help",    l_CmdHelp},
-        {"dbg",     l_CmdHF14AMfDbg},
-        {"rdbl",    l_CmdHF14AMfRdBl},
-        {"rdsc",    l_CmdHF14AMfRdSc},
-        {"dump",    l_CmdHF14AMfDump},
-        {"restore", l_CmdHF14AMfRestore},
-        {"wrbl",    l_CmdHF14AMfWrBl},
-        {"chk",     l_CmdHF14AMfChk},
-        {"mifare",  l_CmdHF14AMifare},
-        {"nested",  l_CmdHF14AMfNested},
-        {"sniff",   l_CmdHF14AMfSniff},
-        {"sim",     l_CmdHF14AMf1kSim},
-        {"eclr",    l_CmdHF14AMfEClear},
-        {"eget",    l_CmdHF14AMfEGet},
-        {"eset",    l_CmdHF14AMfESet},
-        {"eload",   l_CmdHF14AMfELoad},
-        {"esave",   l_CmdHF14AMfESave},
-        {"ecfill",  l_CmdHF14AMfECFill},
-        {"ekeyprn", l_CmdHF14AMfEKeyPrn},
-        {"csetuid", l_CmdHF14AMfCSetUID},
-        {"csetblk", l_CmdHF14AMfCSetBlk},
-        {"cgetblk", l_CmdHF14AMfCGetBlk},
-        {"cgetsc",  l_CmdHF14AMfCGetSc},
-        {"cload",   l_CmdHF14AMfCLoad},
-        {"csave",   l_CmdHF14AMfCSave},
-        {NULL, NULL}
-    };
-    luaL_newlib(L, hfmf_lib);
-    return 1;
-}
-
-static void set_libraries(lua_State *L)
-{
-    static const luaL_Reg hfmf_lib[] = {
-        {"help",    l_CmdHelp},
-        {"dbg",     l_CmdHF14AMfDbg},
-        {"rdbl",    l_CmdHF14AMfRdBl},
-        {"rdsc",    l_CmdHF14AMfRdSc},
-        {"dump",    l_CmdHF14AMfDump},
-        {"restore", l_CmdHF14AMfRestore},
-        {"wrbl",    l_CmdHF14AMfWrBl},
-        {"chk",     l_CmdHF14AMfChk},
-        {"mifare",  l_CmdHF14AMifare},
-        {"nested",  l_CmdHF14AMfNested},
-        {"sniff",   l_CmdHF14AMfSniff},
-        {"sim",     l_CmdHF14AMf1kSim},
-        {"eclr",    l_CmdHF14AMfEClear},
-        {"eget",    l_CmdHF14AMfEGet},
-        {"eset",    l_CmdHF14AMfESet},
-        {"eload",   l_CmdHF14AMfELoad},
-        {"esave",   l_CmdHF14AMfESave},
-        {"ecfill",  l_CmdHF14AMfECFill},
-        {"ekeyprn", l_CmdHF14AMfEKeyPrn},
-        {"csetuid", l_CmdHF14AMfCSetUID},
-        {"csetblk", l_CmdHF14AMfCSetBlk},
-        {"cgetblk", l_CmdHF14AMfCGetBlk},
-        {"cgetsc",  l_CmdHF14AMfCGetSc},
-        {"cload",   l_CmdHF14AMfCLoad},
-        {"csave",   l_CmdHF14AMfCSave},
-        {NULL, NULL}
-    };
-
-    lua_pushglobaltable(L);
-    // Core library is in this table. Contains 'hf'
-
-    //this is 'hf' table
-    lua_newtable(L);
-
-    //this is the mf table
-    lua_newtable(L);
-
-    //Put the function into the hash table.
-    for (int i = 0; hfmf_lib[i].name; i++) {
-        lua_pushcfunction(L, hfmf_lib[i].func);
-        lua_setfield(L, -2, hfmf_lib[i].name);//set the name, pop stack
-    }
-    //Name of 'mf'
-    lua_setfield(L, -2, "mf");
-
-    //Name of 'hf'
-    lua_setfield(L, -2, "hf");
-
-    //-- remove the global environment table from the stack
-    lua_pop(L, 1);
-    return 1;
+/**
+ * Utility to check the ending of a string (used to check file suffix)
+ */
+bool endsWith (char* base, char* str) {
+    int blen = strlen(base);
+    int slen = strlen(str);
+    return (blen >= slen) && (0 == strcmp(base + blen - slen, str));

 }
 
 /**
 }
 
 /**


@@ -235,33 +125,66 @@ int CmdRun(const char *Cmd)
     lua_state = luaL_newstate();
 
     // load Lua libraries
     lua_state = luaL_newstate();
 
     // load Lua libraries

-    static const luaL_Reg lualibs[] =
-    {
-        {"base", luaopen_base },
-        { NULL, NULL}
-    };
+    luaL_openlibs(lua_state);
+
+    //Sets the pm3 core libraries, that go a bit 'under the hood'
+    set_pm3_libraries(lua_state);

 
 

-    const luaL_Reg *lib = lualibs;
-    for(; lib->func != NULL; lib++)
+    //Add the 'bin' library
+    set_bin_library(lua_state);
+
+       //Add the 'bit' library
+       set_bit_library(lua_state);
+
+    char script_name[128] = {0};
+    char arguments[256] = {0};
+
+    int name_len = 0;
+    int arg_len = 0;
+    sscanf(Cmd, "%127s%n %255[^\n\r]%n", script_name,&name_len, arguments, &arg_len);
+
+    char *suffix = "";
+    if(!endsWith(script_name,".lua"))

     {
     {

-        lib->func(lua_state);
-        lua_settop(lua_state, 0);
+        suffix = ".lua";

     }
 
     }
 

-    set_libraries(lua_state);
-    char cmd_name[32];
-    int len = 0;
-    memset(cmd_name, 0, 32);
-    sscanf(Cmd, "%31s%n", cmd_name, &len);
-

     char buf[256];
     char buf[256];

-    snprintf(buf, sizeof buf, "./scripts/%s", cmd_name);
+    snprintf(buf, sizeof buf, "./scripts/%s%s", script_name, suffix);
+
+    printf("--- Executing: %s, args'%s'\n",buf,arguments);
+
+
+

 
 

-    printf("Executing file '%s'\n---------------------------\n" , cmd_name);

     // run the Lua script
     // run the Lua script

-    luaL_dofile(lua_state, buf);
+
+    int error = luaL_loadfile(lua_state, buf);
+    if(!error)
+    {
+
+        lua_pushstring(lua_state, arguments);
+        lua_setglobal(lua_state, "args");
+
+        //Call it with 0 arguments
+         error = lua_pcall(lua_state, 0, LUA_MULTRET, 0); // once again, returns non-0 on error,
+    }
+    if(error) // if non-0, then an error
+    {
+        // the top of the stack should be the error string
+        if (!lua_isstring(lua_state, lua_gettop(lua_state)))
+            printf( "Error - but no error (?!)");
+
+        // get the top of the stack as the error and pop it off
+        const char * str = lua_tostring(lua_state, lua_gettop(lua_state));
+        lua_pop(lua_state, 1);
+        puts(str);
+    }
+
+    //luaL_dofile(lua_state, buf);

     // close the Lua state
     lua_close(lua_state);
     // close the Lua state
     lua_close(lua_state);

-    printf("-----------------Finished\n");
+    printf("\n-----Finished\n");
+    return 0;

 }
 
 }