mirror of
https://github.com/RfidResearchGroup/proxmark3.git
synced 2025-08-21 05:43:48 -07:00
Edit and Updates
Changed from settings to preferences. Added UTF8 Banner support Added Show/Edit draft
This commit is contained in:
mwalker33
parent
1900f6b16a
commit
c9bd43c4b6
9 changed files with 646 additions and 237 deletions
|
|
@ -253,7 +253,7 @@ CMDSRCS = crapto1/crapto1.c \
|
||||||
wiegand_formats.c \
|
wiegand_formats.c \
|
||||||
wiegand_formatutils.c \
|
wiegand_formatutils.c \
|
||||||
cardhelper.c \
|
cardhelper.c \
|
||||||
settings.c
|
preferences.c
|
||||||
|
|
||||||
cpu_arch = $(shell uname -m)
|
cpu_arch = $(shell uname -m)
|
||||||
ifneq ($(findstring 86, $(cpu_arch)), )
|
ifneq ($(findstring 86, $(cpu_arch)), )
|
||||||
|
|
|
||||||
|
|
@ -37,6 +37,7 @@
|
||||||
#include "ui.h"
|
#include "ui.h"
|
||||||
#include "util_posix.h"
|
#include "util_posix.h"
|
||||||
#include "commonutil.h" // ARRAYLEN
|
#include "commonutil.h" // ARRAYLEN
|
||||||
|
#include "preferences.h"
|
||||||
|
|
||||||
static int CmdHelp(const char *Cmd);
|
static int CmdHelp(const char *Cmd);
|
||||||
|
|
||||||
|
|
@ -241,6 +242,11 @@ static int CmdRev(const char *Cmd) {
|
||||||
return PM3_SUCCESS;
|
return PM3_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int CmdPref(const char *Cmd) {
|
||||||
|
CmdPreferences(Cmd);
|
||||||
|
return PM3_SUCCESS;
|
||||||
|
}
|
||||||
|
|
||||||
static command_t CommandTable[] = {
|
static command_t CommandTable[] = {
|
||||||
{"help", CmdHelp, AlwaysAvailable, "This help. Use '<command> help' for details of a particular command."},
|
{"help", CmdHelp, AlwaysAvailable, "This help. Use '<command> help' for details of a particular command."},
|
||||||
{"auto", CmdAuto, IfPm3Present, "Automated detection process for unknown tags"},
|
{"auto", CmdAuto, IfPm3Present, "Automated detection process for unknown tags"},
|
||||||
|
|
@ -259,6 +265,7 @@ static command_t CommandTable[] = {
|
||||||
{"wiegand", CmdWiegand, AlwaysAvailable, "{ Wiegand format manipulation... }"},
|
{"wiegand", CmdWiegand, AlwaysAvailable, "{ Wiegand format manipulation... }"},
|
||||||
{"", CmdHelp, AlwaysAvailable, ""},
|
{"", CmdHelp, AlwaysAvailable, ""},
|
||||||
{"hints", CmdHints, AlwaysAvailable, "Turn hints on / off"},
|
{"hints", CmdHints, AlwaysAvailable, "Turn hints on / off"},
|
||||||
|
{"pref", CmdPref, AlwaysAvailable, "Edit preferences"},
|
||||||
{"msleep", CmdMsleep, AlwaysAvailable, "Add a pause in milliseconds"},
|
{"msleep", CmdMsleep, AlwaysAvailable, "Add a pause in milliseconds"},
|
||||||
{"rem", CmdRem, AlwaysAvailable, "Add a text line in log file"},
|
{"rem", CmdRem, AlwaysAvailable, "Add a text line in log file"},
|
||||||
{"quit", CmdQuit, AlwaysAvailable, ""},
|
{"quit", CmdQuit, AlwaysAvailable, ""},
|
||||||
|
|
|
||||||
|
|
@ -38,7 +38,7 @@
|
||||||
// this define is needed for scandir/alphasort to work
|
// this define is needed for scandir/alphasort to work
|
||||||
#define _GNU_SOURCE
|
#define _GNU_SOURCE
|
||||||
#include "fileutils.h"
|
#include "fileutils.h"
|
||||||
#include "settings.h"
|
#include "preferences.h"
|
||||||
|
|
||||||
#include <dirent.h>
|
#include <dirent.h>
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
|
|
@ -427,7 +427,7 @@ int saveFileJSON(const char *preferredName, JSONFileType ftype, uint8_t *data, s
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case jsfSettings:
|
case jsfSettings:
|
||||||
settings_save_callback (root);
|
preferences_save_callback (root);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
|
|
@ -868,7 +868,7 @@ int loadFileJSON(const char *preferredName, void *data, size_t maxdatalen, size_
|
||||||
*datalen = sptr;
|
*datalen = sptr;
|
||||||
}
|
}
|
||||||
if (!strcmp(ctype,"settings")) {
|
if (!strcmp(ctype,"settings")) {
|
||||||
settings_load_callback (root);
|
preferences_load_callback (root);
|
||||||
}
|
}
|
||||||
PrintAndLogEx(SUCCESS, "loaded from JSON file " _YELLOW_("%s"), fileName);
|
PrintAndLogEx(SUCCESS, "loaded from JSON file " _YELLOW_("%s"), fileName);
|
||||||
out:
|
out:
|
||||||
|
|
|
||||||
563
client/preferences.c
Normal file
563
client/preferences.c
Normal file
|
|
@ -0,0 +1,563 @@
|
||||||
|
/*****************************************************************************
|
||||||
|
* WARNING
|
||||||
|
*
|
||||||
|
* THIS CODE IS CREATED FOR EXPERIMENTATION AND EDUCATIONAL USE ONLY.
|
||||||
|
*
|
||||||
|
* USAGE OF THIS CODE IN OTHER WAYS MAY INFRINGE UPON THE INTELLECTUAL
|
||||||
|
* PROPERTY OF OTHER PARTIES, SUCH AS INSIDE SECURE AND HID GLOBAL,
|
||||||
|
* AND MAY EXPOSE YOU TO AN INFRINGEMENT ACTION FROM THOSE PARTIES.
|
||||||
|
*
|
||||||
|
*
|
||||||
|
*****************************************************************************
|
||||||
|
*
|
||||||
|
* This file is part of loclass. It is a reconstructon of the cipher engine
|
||||||
|
* used in iClass, and RFID techology.
|
||||||
|
*
|
||||||
|
* The implementation is based on the work performed by
|
||||||
|
* Flavio D. Garcia, Gerhard de Koning Gans, Roel Verdult and
|
||||||
|
* Milosch Meriac in the paper "Dismantling IClass".
|
||||||
|
*
|
||||||
|
* Copyright (C) 2014 Martin Holst Swende
|
||||||
|
*
|
||||||
|
* This is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License version 2 as published
|
||||||
|
* by the Free Software Foundation, or, at your option, any later version.
|
||||||
|
*
|
||||||
|
* This file is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with loclass. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*
|
||||||
|
*
|
||||||
|
****************************************************************************/
|
||||||
|
|
||||||
|
//-----------------------------------------------------------------------------
|
||||||
|
// Preferences Functions
|
||||||
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
//-----------------------------------------------------------------------------
|
||||||
|
// Notes
|
||||||
|
// To add a new setting
|
||||||
|
// Add the new setting to the session_arg_t; in ui.h
|
||||||
|
// Add the default value for the setting in the settings_load page below
|
||||||
|
// Update the preferences_load_callback to load your setting into the stucture
|
||||||
|
// Update the preferences_save_callback to enusre your setting gets saved when needed.
|
||||||
|
// use the preference as needed : session.<preference name>
|
||||||
|
// Can use (session.preferences_loaded) to check if json settings file was used
|
||||||
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
#include "preferences.h"
|
||||||
|
#include "comms.h"
|
||||||
|
#include "emv/emvjson.h"
|
||||||
|
#include <string.h>
|
||||||
|
#include "cmdparser.h"
|
||||||
|
#include <ctype.h>
|
||||||
|
|
||||||
|
static int CmdHelp(const char *Cmd);
|
||||||
|
|
||||||
|
// Load all settings into memory (struct)
|
||||||
|
int preferences_load (void) {
|
||||||
|
|
||||||
|
// Set all defaults
|
||||||
|
session.client_debug_level = OFF;
|
||||||
|
session.window_plot_xpos = 10;
|
||||||
|
session.window_plot_ypos = 30;
|
||||||
|
session.window_plot_hsize = 400;
|
||||||
|
session.window_plot_wsize = 800;
|
||||||
|
session.window_overlay_xpos = session.window_plot_xpos;
|
||||||
|
session.window_overlay_ypos = 60+session.window_plot_ypos + session.window_plot_hsize;
|
||||||
|
session.window_overlay_hsize = 200;
|
||||||
|
session.window_overlay_wsize = session.window_plot_wsize;
|
||||||
|
session.emoji_mode = ALIAS;
|
||||||
|
session.show_hints = false;
|
||||||
|
session.supports_colors = false;
|
||||||
|
|
||||||
|
// loadFileJson wants these, so pass in place holder values, though not used
|
||||||
|
// in settings load;
|
||||||
|
uint8_t dummyData = 0x00;
|
||||||
|
size_t dummyDL = 0x00;
|
||||||
|
|
||||||
|
if (loadFileJSON(preferencesFilename, &dummyData, sizeof(dummyData), &dummyDL) == PM3_SUCCESS) {
|
||||||
|
session.preferences_loaded = true;
|
||||||
|
}
|
||||||
|
// Note, if session.settings_loaded == false then the settings_save
|
||||||
|
// will be called in main () to save settings as set in defaults and main() checks.
|
||||||
|
|
||||||
|
return PM3_SUCCESS;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Save all settings from memory (struct) to file
|
||||||
|
int preferences_save (void) {
|
||||||
|
// Note sure if backup has value ?
|
||||||
|
char backupFilename[500];
|
||||||
|
|
||||||
|
snprintf (backupFilename,sizeof(backupFilename),"%s.bak",preferencesFilename);
|
||||||
|
|
||||||
|
if (fileExists (backupFilename)) {
|
||||||
|
if (remove (backupFilename) != 0) {
|
||||||
|
PrintAndLogEx (FAILED, "Error - could not delete old settings backup file \"%s\"",backupFilename);
|
||||||
|
return PM3_ESOFT;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (fileExists (preferencesFilename)) {
|
||||||
|
if (rename (preferencesFilename,backupFilename) != 0) {
|
||||||
|
PrintAndLogEx (FAILED, "Error - could not backup settings file \"%s\" to \"%s\"",preferencesFilename,backupFilename);
|
||||||
|
return PM3_ESOFT;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
uint8_t dummyData = 0x00;
|
||||||
|
size_t dummyDL = 0x00;
|
||||||
|
|
||||||
|
if (saveFileJSON(preferencesFilename, jsfSettings, &dummyData, dummyDL) != PM3_SUCCESS)
|
||||||
|
PrintAndLogEx (ERR, "Error saving preferences to \"%s\"",preferencesFilename);
|
||||||
|
|
||||||
|
return PM3_SUCCESS;
|
||||||
|
}
|
||||||
|
|
||||||
|
void preferences_save_callback (json_t *root) {
|
||||||
|
|
||||||
|
JsonSaveStr (root,"FileType","settings");
|
||||||
|
|
||||||
|
// Log level, convert to text
|
||||||
|
switch (session.client_debug_level) {
|
||||||
|
case OFF: JsonSaveStr (root,"client.debug.level","off"); break;
|
||||||
|
case SIMPLE: JsonSaveStr (root,"client.debug.level","simple"); break;
|
||||||
|
case FULL: JsonSaveStr (root,"client.debug.level","full"); break;
|
||||||
|
default:
|
||||||
|
JsonSaveStr (root,"logging.level","NORMAL");
|
||||||
|
}
|
||||||
|
|
||||||
|
// Plot window
|
||||||
|
JsonSaveInt (root,"window.plot.xpos",session.window_plot_xpos);
|
||||||
|
JsonSaveInt (root,"window.plot.ypos",session.window_plot_ypos);
|
||||||
|
JsonSaveInt (root,"window.plot.hsize",session.window_plot_hsize);
|
||||||
|
JsonSaveInt (root,"window.plot.wsize",session.window_plot_wsize);
|
||||||
|
|
||||||
|
// Overlay/Slider window
|
||||||
|
JsonSaveInt (root,"window.overlay.xpos",session.window_overlay_xpos);
|
||||||
|
JsonSaveInt (root,"window.overlay.ypos",session.window_overlay_ypos);
|
||||||
|
JsonSaveInt (root,"window.overlay.hsize",session.window_overlay_hsize);
|
||||||
|
JsonSaveInt (root,"window.overlay.wsize",session.window_overlay_wsize);
|
||||||
|
|
||||||
|
// Emoji
|
||||||
|
switch (session.emoji_mode) {
|
||||||
|
case ALIAS: JsonSaveStr (root,"show.emoji","alias"); break;
|
||||||
|
case EMOJI: JsonSaveStr (root,"show.emoji","emoji"); break;
|
||||||
|
case ALTTEXT: JsonSaveStr (root,"show.emoji","alttext"); break;
|
||||||
|
case ERASE: JsonSaveStr (root,"show.emoji","erase"); break;
|
||||||
|
default:
|
||||||
|
JsonSaveStr (root,"show.emoji","ALIAS");
|
||||||
|
}
|
||||||
|
|
||||||
|
JsonSaveBoolean (root,"show.hints",session.show_hints);
|
||||||
|
|
||||||
|
JsonSaveBoolean (root,"os.supports.colors",session.supports_colors);
|
||||||
|
}
|
||||||
|
|
||||||
|
void preferences_load_callback (json_t *root) {
|
||||||
|
json_error_t up_error = {0};
|
||||||
|
bool b1;
|
||||||
|
int i1;
|
||||||
|
const char *s1;
|
||||||
|
char tempStr [500]; // to use str_lower() since json unpack uses const char *
|
||||||
|
|
||||||
|
// Logging Level
|
||||||
|
if (json_unpack_ex(root,&up_error, 0, "{s:s}","client.debug.level",&s1) == 0) {
|
||||||
|
strncpy (tempStr,s1,sizeof(tempStr)-1);
|
||||||
|
str_lower (tempStr);
|
||||||
|
if (strncmp (tempStr,"off",3) == 0) session.client_debug_level = OFF;
|
||||||
|
if (strncmp (tempStr,"simple",6) == 0) session.client_debug_level = SIMPLE;
|
||||||
|
if (strncmp (tempStr,"full",4) == 0) session.client_debug_level = FULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
// window plot
|
||||||
|
if (json_unpack_ex(root,&up_error, 0, "{s:i}","window.plot.xpos",&i1) == 0)
|
||||||
|
session.window_plot_xpos = i1;
|
||||||
|
if (json_unpack_ex(root,&up_error, 0, "{s:i}","window.plot.ypos",&i1) == 0)
|
||||||
|
session.window_plot_ypos = i1;
|
||||||
|
if (json_unpack_ex(root,&up_error, 0, "{s:i}","window.plot.hsize",&i1) == 0)
|
||||||
|
session.window_plot_hsize = i1;
|
||||||
|
if (json_unpack_ex(root,&up_error, 0, "{s:i}","window.plot.wsize",&i1) == 0)
|
||||||
|
session.window_plot_wsize = i1;
|
||||||
|
|
||||||
|
// overlay/slider plot
|
||||||
|
if (json_unpack_ex(root,&up_error, 0, "{s:i}","window.overlay.xpos",&i1) == 0)
|
||||||
|
session.window_overlay_xpos = i1;
|
||||||
|
if (json_unpack_ex(root,&up_error, 0, "{s:i}","window.overlay.ypos",&i1) == 0)
|
||||||
|
session.window_overlay_ypos = i1;
|
||||||
|
if (json_unpack_ex(root,&up_error, 0, "{s:i}","window.overlay.hsize",&i1) == 0)
|
||||||
|
session.window_overlay_hsize = i1;
|
||||||
|
if (json_unpack_ex(root,&up_error, 0, "{s:i}","window.overlay.wsize",&i1) == 0)
|
||||||
|
session.window_overlay_wsize = i1;
|
||||||
|
|
||||||
|
// show options
|
||||||
|
if (json_unpack_ex(root,&up_error, 0, "{s:s}","show.emoji",&s1) == 0) {
|
||||||
|
strncpy (tempStr,s1,sizeof(tempStr)-1);
|
||||||
|
str_lower (tempStr);
|
||||||
|
if (strncmp (tempStr,"alias",5) == 0) session.emoji_mode = ALIAS;
|
||||||
|
if (strncmp (tempStr,"emoji",5) == 0) session.emoji_mode = EMOJI;
|
||||||
|
if (strncmp (tempStr,"alttext",7) == 0) session.emoji_mode = ALTTEXT;
|
||||||
|
if (strncmp (tempStr,"erase",5) == 0) session.emoji_mode = ERASE;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (json_unpack_ex(root,&up_error, 0, "{s:b}","show.hints",&b1) == 0)
|
||||||
|
session.show_hints = b1;
|
||||||
|
|
||||||
|
if (json_unpack_ex(root,&up_error, 0, "{s:b}","os.supports.colors",&b1) == 0)
|
||||||
|
session.supports_colors = b1;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
// Help Functions
|
||||||
|
static int usage_pref_set() {
|
||||||
|
PrintAndLogEx(NORMAL, "Usage: pref set [(h)elp] [(e)moji ...] [(c)olor ...] [(hi)nts ...] [debug ...]");
|
||||||
|
PrintAndLogEx(NORMAL, " [(p)lot ...] [(o)verlay ...]");
|
||||||
|
PrintAndLogEx(NORMAL, "Options:");
|
||||||
|
PrintAndLogEx(NORMAL, " help - This help");
|
||||||
|
PrintAndLogEx(NORMAL, " emoji <(ali)as | (em)oji | (alt)text | (er)ase> - Set the level of emoji support");
|
||||||
|
PrintAndLogEx(NORMAL, " alias : show alias");
|
||||||
|
PrintAndLogEx(NORMAL, " emoji : show emoji");
|
||||||
|
PrintAndLogEx(NORMAL, " alttext : show alternative text");
|
||||||
|
PrintAndLogEx(NORMAL, " erase : dont show any emoji");
|
||||||
|
|
||||||
|
PrintAndLogEx(NORMAL, " color <(o)ff|(a)nsi> - Color support level");
|
||||||
|
PrintAndLogEx(NORMAL, " off : dont use color");
|
||||||
|
PrintAndLogEx(NORMAL, " ansi : use ansi color (linux, mac, windows terminal)");
|
||||||
|
|
||||||
|
PrintAndLogEx(NORMAL, " hints <(of)f | on> - Show hints on/off");
|
||||||
|
|
||||||
|
PrintAndLogEx(NORMAL, " debug <(o)ff | (s)imple | (f)ull> - Client debug level");
|
||||||
|
PrintAndLogEx(NORMAL, " off : no debug output");
|
||||||
|
PrintAndLogEx(NORMAL, " simple : information level debug");
|
||||||
|
PrintAndLogEx(NORMAL, " full : full debug information");
|
||||||
|
|
||||||
|
PrintAndLogEx(NORMAL, " plot [x <val>] [y <val>] [h <val>] [w <val>] - Position the plot window");
|
||||||
|
PrintAndLogEx(NORMAL, " overlay [x <val>] [y <val>] [h <val>] [w <val>] - Position the overlay/slider window");
|
||||||
|
|
||||||
|
return PM3_SUCCESS;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int usage_pref_show() {
|
||||||
|
PrintAndLogEx(NORMAL, "Usage: pref show [help] [emoji|color]");
|
||||||
|
PrintAndLogEx(NORMAL, "Options:");
|
||||||
|
PrintAndLogEx(NORMAL, " help - This help");
|
||||||
|
PrintAndLogEx(NORMAL, " emoji - show current settings for emoji");
|
||||||
|
PrintAndLogEx(NORMAL, " color - show current settings for color");
|
||||||
|
|
||||||
|
return PM3_SUCCESS;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Preference Processing Functions
|
||||||
|
typedef enum preferenceId {prefNONE,prefHELP,prefEMOJI,prefCOLOR,prefPLOT,prefOVERLAY,prefHINTS,prefCLIENTDEBUG} preferenceId_t;
|
||||||
|
|
||||||
|
// Enumerate text to ID
|
||||||
|
preferenceId_t prefGetID (char* cmdOpt)
|
||||||
|
{
|
||||||
|
str_lower (cmdOpt);
|
||||||
|
|
||||||
|
if (strncmp (cmdOpt,"hi",2) == 0) return prefHINTS;
|
||||||
|
if (strncmp (cmdOpt,"h",1) == 0) return prefHELP;
|
||||||
|
if (strncmp (cmdOpt,"e",1) == 0) return prefEMOJI;
|
||||||
|
if (strncmp (cmdOpt,"c",1) == 0) return prefCOLOR;
|
||||||
|
if (strncmp (cmdOpt,"p",1) == 0) return prefPLOT;
|
||||||
|
if (strncmp (cmdOpt,"o",1) == 0) return prefOVERLAY;
|
||||||
|
if (strncmp (cmdOpt,"d",1) == 0) return prefCLIENTDEBUG;
|
||||||
|
|
||||||
|
return NONE;
|
||||||
|
}
|
||||||
|
|
||||||
|
void showEmojiState (void) {
|
||||||
|
switch (session.emoji_mode) {
|
||||||
|
case ALIAS: PrintAndLogEx(NORMAL, " emoji.................. "_GREEN_("show alias"));
|
||||||
|
break;
|
||||||
|
case EMOJI: PrintAndLogEx(NORMAL, " emoji.................. "_GREEN_("show emoji"));
|
||||||
|
break;
|
||||||
|
case ALTTEXT: PrintAndLogEx(NORMAL, " emoji.................. "_GREEN_("show alt text"));
|
||||||
|
break;
|
||||||
|
case ERASE: PrintAndLogEx(NORMAL, " emoji.................. "_GREEN_("dont show emoji"));
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
PrintAndLogEx(NORMAL, " emoji.................. "_RED_("unknown"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void showColorState (void) {
|
||||||
|
/*
|
||||||
|
switch (session.supports_colors) {
|
||||||
|
case false: PrintAndLogEx(NORMAL, "Color : "_GREEN_("off"));
|
||||||
|
break;
|
||||||
|
case true: PrintAndLogEx(NORMAL, "Color : "_GREEN_("ansi"));
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
PrintAndLogEx(NORMAL, "Color support set to : "_RED_("unknown"));
|
||||||
|
}
|
||||||
|
*/
|
||||||
|
// this will change to 1 of a set from bool
|
||||||
|
if (session.supports_colors)
|
||||||
|
PrintAndLogEx(NORMAL, " color.................. "_GREEN_("ansi"));
|
||||||
|
else
|
||||||
|
PrintAndLogEx(NORMAL, " color.................. "_GREEN_("off"));
|
||||||
|
}
|
||||||
|
|
||||||
|
void showClientDebugState (void) {
|
||||||
|
switch (session.client_debug_level) {
|
||||||
|
case OFF: PrintAndLogEx (NORMAL," client debug........... "_GREEN_("off"));
|
||||||
|
break;
|
||||||
|
case SIMPLE: PrintAndLogEx (NORMAL," client debug........... "_GREEN_("simple"));
|
||||||
|
break;
|
||||||
|
case FULL: PrintAndLogEx (NORMAL," client debug........... "_GREEN_("full"));
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
PrintAndLogEx(NORMAL, " client debug........... "_RED_("unknown"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void showPlotPosState (void){
|
||||||
|
PrintAndLogEx (NORMAL," Plot window............ X "_GREEN_("%4d")" Y "_GREEN_("%4d")" H "_GREEN_("%4d")" W "_GREEN_("%4d"),
|
||||||
|
session.window_plot_xpos,session.window_plot_ypos,session.window_plot_hsize,session.window_plot_wsize);
|
||||||
|
}
|
||||||
|
|
||||||
|
void showOverlayPosState (void){
|
||||||
|
PrintAndLogEx (NORMAL," Slider/Overlay window.. X "_GREEN_("%4d")" Y "_GREEN_("%4d")" H "_GREEN_("%4d")" W "_GREEN_("%4d"),
|
||||||
|
session.window_overlay_xpos,session.window_overlay_ypos,session.window_overlay_hsize,session.window_overlay_wsize);
|
||||||
|
}
|
||||||
|
|
||||||
|
void showHintsState (void){
|
||||||
|
if (session.show_hints)
|
||||||
|
PrintAndLogEx (NORMAL," Hints.................. "_GREEN_("on"));
|
||||||
|
else
|
||||||
|
PrintAndLogEx (NORMAL," Hints.................. "_GREEN_("off"));
|
||||||
|
}
|
||||||
|
|
||||||
|
static int CmdPrefShow (const char *Cmd) {
|
||||||
|
uint8_t cmdp = 0;
|
||||||
|
preferenceId_t CmdPref;
|
||||||
|
bool errors = false;
|
||||||
|
char strOpt[50];
|
||||||
|
|
||||||
|
PrintAndLogEx(NORMAL,"");
|
||||||
|
PrintAndLogEx(NORMAL,_BLUE_("Preferences"));
|
||||||
|
|
||||||
|
if (!session. preferences_loaded) {
|
||||||
|
PrintAndLogEx (ERR,"Preferneces not loaded");
|
||||||
|
return PM3_ESOFT;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (param_getchar(Cmd, cmdp) == 0x00) { // No options - Show all
|
||||||
|
showEmojiState ();
|
||||||
|
showColorState ();
|
||||||
|
showPlotPosState ();
|
||||||
|
showOverlayPosState ();
|
||||||
|
showClientDebugState();
|
||||||
|
showHintsState ();
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
|
||||||
|
while ((param_getchar(Cmd, cmdp) != 0x00) && !errors) {
|
||||||
|
|
||||||
|
if (param_getstr(Cmd, cmdp, strOpt, sizeof(strOpt)) != 0) {
|
||||||
|
CmdPref = prefGetID(strOpt);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
CmdPref = prefNONE;
|
||||||
|
|
||||||
|
switch (CmdPref) {
|
||||||
|
case prefHELP:
|
||||||
|
return usage_pref_show();
|
||||||
|
case prefEMOJI:
|
||||||
|
showEmojiState ();
|
||||||
|
break;
|
||||||
|
case prefCOLOR: // color
|
||||||
|
showColorState ();
|
||||||
|
break;
|
||||||
|
case prefPLOT:
|
||||||
|
showPlotPosState ();
|
||||||
|
break;
|
||||||
|
case prefOVERLAY:
|
||||||
|
showOverlayPosState ();
|
||||||
|
break;
|
||||||
|
case prefCLIENTDEBUG:
|
||||||
|
showClientDebugState();
|
||||||
|
break;
|
||||||
|
case prefHINTS:
|
||||||
|
showHintsState();
|
||||||
|
break;
|
||||||
|
case prefNONE:
|
||||||
|
PrintAndLogEx (ERR,"Invalid option supplied");
|
||||||
|
errors = true;
|
||||||
|
break;
|
||||||
|
// errors
|
||||||
|
}
|
||||||
|
cmdp ++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
PrintAndLogEx(NORMAL,"");
|
||||||
|
return PM3_SUCCESS;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int CmdPrefSet (const char *Cmd)
|
||||||
|
{
|
||||||
|
uint8_t cmdp = 0;
|
||||||
|
preferenceId_t CmdPref;
|
||||||
|
bool errors = false;
|
||||||
|
// char charOpt;
|
||||||
|
char strOpt[50];
|
||||||
|
int x,y,h,w;
|
||||||
|
|
||||||
|
if (param_getchar(Cmd, cmdp) == 0x00)
|
||||||
|
return usage_pref_set();
|
||||||
|
|
||||||
|
while ((param_getchar(Cmd, cmdp) != 0x00) && !errors) {
|
||||||
|
|
||||||
|
if (param_getstr(Cmd, cmdp, strOpt, sizeof(strOpt)) != 0) {
|
||||||
|
CmdPref = prefGetID(strOpt);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
CmdPref = prefNONE;
|
||||||
|
|
||||||
|
switch (CmdPref) {
|
||||||
|
case prefHELP:
|
||||||
|
return usage_pref_set();
|
||||||
|
case prefEMOJI:
|
||||||
|
showEmojiState ();
|
||||||
|
cmdp++;
|
||||||
|
if (param_getstr(Cmd, cmdp, strOpt, sizeof(strOpt)) != 0) {
|
||||||
|
str_lower(strOpt);
|
||||||
|
if (strncmp (strOpt,"ali",3) == 0) { session.emoji_mode = ALIAS; showEmojiState (); break; }
|
||||||
|
if (strncmp (strOpt,"em",2) == 0) { session.emoji_mode = EMOJI; showEmojiState (); break; }
|
||||||
|
if (strncmp (strOpt,"alt",3) == 0) { session.emoji_mode = ALTTEXT; showEmojiState (); break; }
|
||||||
|
if (strncmp (strOpt,"er",2) == 0) { session.emoji_mode = ERASE; showEmojiState (); break; }
|
||||||
|
// if we get this far, then an error in the mode
|
||||||
|
PrintAndLogEx(ERR,"Invalid emoji option");
|
||||||
|
errors = true;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
errors = true;
|
||||||
|
break;
|
||||||
|
case prefCOLOR: // color
|
||||||
|
showColorState ();
|
||||||
|
cmdp++;
|
||||||
|
if (param_getstr(Cmd, cmdp, strOpt, sizeof(strOpt)) != 0) {
|
||||||
|
str_lower(strOpt);
|
||||||
|
if (strncmp(strOpt,"a",1) == 0) { session.supports_colors = true; showColorState (); break; }
|
||||||
|
if (strncmp(strOpt,"o",1) == 0) { session.supports_colors = false; showColorState (); break; }
|
||||||
|
// if we get this far, then an error in the mode
|
||||||
|
PrintAndLogEx(ERR,"Invalid color option");
|
||||||
|
errors = true;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
errors = true;
|
||||||
|
break;
|
||||||
|
case prefPLOT:
|
||||||
|
showPlotPosState ();
|
||||||
|
cmdp++;
|
||||||
|
x = y = h = w = -99999; // Some invalid value
|
||||||
|
for (int i = 0; i < 4; i++) { // upto 4 values X, Y, H, WARNING
|
||||||
|
if (param_getchar(Cmd, cmdp) != 0){
|
||||||
|
switch (tolower(param_getchar(Cmd, cmdp++))) {
|
||||||
|
case 'x': x = param_get32ex(Cmd,cmdp++,-99999,10); break;
|
||||||
|
case 'y': y = param_get32ex(Cmd,cmdp++,-99999,10); break;
|
||||||
|
case 'h': h = param_get32ex(Cmd,cmdp++,-99999,10); break;
|
||||||
|
case 'w': w = param_get32ex(Cmd,cmdp++,-99999,10); break;
|
||||||
|
default:
|
||||||
|
errors = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (x != -99999) session.window_plot_xpos = x;
|
||||||
|
if (y != -99999) session.window_plot_ypos = y;
|
||||||
|
if (h != -99999) session.window_plot_hsize = h;
|
||||||
|
if (w != -99999) session.window_plot_wsize = w;
|
||||||
|
// Need to work out how to change live....
|
||||||
|
// calling data plot seems to work
|
||||||
|
|
||||||
|
showPlotPosState ();
|
||||||
|
break;
|
||||||
|
case prefOVERLAY:
|
||||||
|
showOverlayPosState ();
|
||||||
|
cmdp++;
|
||||||
|
x = y = h = w = -99999; // Some invalid value
|
||||||
|
for (int i = 0; i < 4; i++) { // upto 4 values X, Y, H, WARNING
|
||||||
|
if (param_getchar(Cmd, cmdp) != 0){
|
||||||
|
switch (tolower(param_getchar(Cmd, cmdp++))) {
|
||||||
|
case 'x': x = param_get32ex(Cmd,cmdp++,-99999,10); break;
|
||||||
|
case 'y': y = param_get32ex(Cmd,cmdp++,-99999,10); break;
|
||||||
|
case 'h': h = param_get32ex(Cmd,cmdp++,-99999,10); break;
|
||||||
|
case 'w': w = param_get32ex(Cmd,cmdp++,-99999,10); break;
|
||||||
|
default:
|
||||||
|
errors = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (x != -99999) session.window_overlay_xpos = x;
|
||||||
|
if (y != -99999) session.window_overlay_ypos = y;
|
||||||
|
if (h != -99999) session.window_overlay_hsize = h;
|
||||||
|
if (w != -99999) session.window_overlay_wsize = w;
|
||||||
|
showOverlayPosState ();
|
||||||
|
// Need to work out how to change live....
|
||||||
|
break;
|
||||||
|
case prefCLIENTDEBUG:
|
||||||
|
showClientDebugState();
|
||||||
|
cmdp++;
|
||||||
|
if (param_getstr(Cmd, cmdp, strOpt, sizeof(strOpt)) != 0) {
|
||||||
|
str_lower(strOpt);
|
||||||
|
if (strncmp(strOpt,"o",1) == 0) { session.client_debug_level = OFF; g_debugMode = OFF; showClientDebugState(); break; }
|
||||||
|
if (strncmp(strOpt,"s",1) == 0) { session.client_debug_level = SIMPLE; g_debugMode = SIMPLE; showClientDebugState(); break; }
|
||||||
|
if (strncmp(strOpt,"f",1) == 0) { session.client_debug_level = FULL; g_debugMode = FULL; showClientDebugState(); break; }
|
||||||
|
// if we get this far, then an error in the mode
|
||||||
|
PrintAndLogEx(ERR,"Invalid client debug option");
|
||||||
|
errors = true;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
errors = true;
|
||||||
|
break;
|
||||||
|
case prefHINTS:
|
||||||
|
showHintsState ();
|
||||||
|
cmdp++;
|
||||||
|
if (param_getstr(Cmd, cmdp, strOpt, sizeof(strOpt)) != 0) {
|
||||||
|
str_lower(strOpt);
|
||||||
|
if (strncmp(strOpt,"on",2) == 0) { session.show_hints = true; showHintsState (); break; }
|
||||||
|
if (strncmp(strOpt,"of",2) == 0) { session.show_hints = false; showHintsState (); break; }
|
||||||
|
// if we get this far, then an error in the mode
|
||||||
|
PrintAndLogEx(ERR,"Invalid hint option");
|
||||||
|
errors = true;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
errors = true;
|
||||||
|
break;
|
||||||
|
case prefNONE:
|
||||||
|
PrintAndLogEx (ERR,"Invalid option supplied");
|
||||||
|
errors = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
cmdp ++;
|
||||||
|
}
|
||||||
|
preferences_save();
|
||||||
|
return PM3_SUCCESS;
|
||||||
|
}
|
||||||
|
|
||||||
|
static command_t CommandTable[] = {
|
||||||
|
{"help", CmdHelp, AlwaysAvailable, "This help"},
|
||||||
|
{"set", CmdPrefSet, AlwaysAvailable, "Set a preference"},
|
||||||
|
{"show", CmdPrefShow, AlwaysAvailable, "Show (a preference)"},
|
||||||
|
{NULL, NULL, NULL, NULL}
|
||||||
|
};
|
||||||
|
|
||||||
|
static int CmdHelp(const char *Cmd) {
|
||||||
|
(void)Cmd; // Cmd is not used so far
|
||||||
|
CmdsHelp(CommandTable);
|
||||||
|
|
||||||
|
return PM3_SUCCESS;
|
||||||
|
}
|
||||||
|
|
||||||
|
int CmdPreferences (const char *Cmd)
|
||||||
|
{
|
||||||
|
clearCommandBuffer();
|
||||||
|
|
||||||
|
return CmdsParse(CommandTable, Cmd);
|
||||||
|
}
|
||||||
|
|
@ -8,17 +8,18 @@
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
// Settings Functions
|
// Settings Functions
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
#ifndef SETTINGS_H_
|
#ifndef PREFERENCES_H_
|
||||||
#define SETTINGS_H_
|
#define PREFERENCES_H_
|
||||||
|
|
||||||
#include "fileutils.h"
|
#include "fileutils.h"
|
||||||
|
|
||||||
#define settingsFilename "settings.json"
|
#define preferencesFilename "preferences.json"
|
||||||
|
|
||||||
int settings_load (void);
|
int CmdPreferences (const char *Cmd);
|
||||||
int settings_save (void);
|
int preferences_load (void);
|
||||||
|
int preferences_save (void);
|
||||||
|
|
||||||
void settings_save_callback (json_t *root);
|
void preferences_save_callback (json_t *root);
|
||||||
void settings_load_callback (json_t *root);
|
void preferences_load_callback (json_t *root);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -170,7 +170,7 @@ void ProxWidget::vchange_dthr_down(int v) {
|
||||||
ProxWidget::ProxWidget(QWidget *parent, ProxGuiQT *master) : QWidget(parent) {
|
ProxWidget::ProxWidget(QWidget *parent, ProxGuiQT *master) : QWidget(parent) {
|
||||||
this->master = master;
|
this->master = master;
|
||||||
// Set the initail postion and size from settings
|
// Set the initail postion and size from settings
|
||||||
if (session.settings_loaded)
|
if (session.preferences_loaded)
|
||||||
setGeometry (session.window_plot_xpos,session.window_plot_ypos,session.window_plot_wsize,session.window_plot_hsize);
|
setGeometry (session.window_plot_xpos,session.window_plot_ypos,session.window_plot_wsize,session.window_plot_hsize);
|
||||||
else
|
else
|
||||||
resize(800, 400);
|
resize(800, 400);
|
||||||
|
|
@ -210,7 +210,7 @@ ProxWidget::ProxWidget(QWidget *parent, ProxGuiQT *master) : QWidget(parent) {
|
||||||
// shows plot window on the screen.
|
// shows plot window on the screen.
|
||||||
show();
|
show();
|
||||||
|
|
||||||
if (session.settings_loaded)
|
if (session.preferences_loaded)
|
||||||
controlWidget->setGeometry (session.window_overlay_xpos,session.window_overlay_ypos,session.window_overlay_wsize,session.window_overlay_hsize);
|
controlWidget->setGeometry (session.window_overlay_xpos,session.window_overlay_ypos,session.window_overlay_wsize,session.window_overlay_hsize);
|
||||||
else {
|
else {
|
||||||
// Move controller widget below plot
|
// Move controller widget below plot
|
||||||
|
|
|
||||||
|
|
@ -27,13 +27,58 @@
|
||||||
#include "comms.h"
|
#include "comms.h"
|
||||||
#include "fileutils.h"
|
#include "fileutils.h"
|
||||||
#include "flash.h"
|
#include "flash.h"
|
||||||
#include "settings.h"
|
#include "preferences.h"
|
||||||
|
|
||||||
// Used to enable/disable use of settings json file
|
// Used to enable/disable use of preferences json file
|
||||||
#define USE_SETTING_FILE
|
// #define USE_PREFERENCE_FILE
|
||||||
|
|
||||||
|
#ifdef _WIN32
|
||||||
|
|
||||||
|
static void utf8_showBanner (void) {
|
||||||
|
|
||||||
|
char sq[] = { 0xE2,0x96,0x88,0x00 }; // square block
|
||||||
|
char tr[] = { 0xE2,0x95,0x97,0x00 }; // top rigth corner
|
||||||
|
char tl[] = { 0xE2,0x95,0x94,0x00 }; // top left corner
|
||||||
|
char br[] = { 0xE2,0x95,0x9D,0x00 }; // bottom right corner
|
||||||
|
char bl[] = { 0xE2,0x95,0x9A,0x00 }; // bottom left corner
|
||||||
|
char hl[] = { 0xE2,0x95,0x90,0x00 }; // horiz line
|
||||||
|
char vl[] = { 0xE2,0x95,0x91,0x00 }; // vert line
|
||||||
|
char msg1 [60];
|
||||||
|
char msg2 [60];
|
||||||
|
char msg3 [60];
|
||||||
|
|
||||||
|
strcpy (msg1," :snowflake: iceman@icesql.net :coffee:");
|
||||||
|
strcpy (msg2," https://github.com/rfidresearchgroup/proxmark3/");
|
||||||
|
strcpy (msg3,"pre-release v4.0");
|
||||||
|
|
||||||
|
g_printAndLog = PRINTANDLOG_PRINT;
|
||||||
|
|
||||||
|
PrintAndLogEx(NORMAL, "\n");
|
||||||
|
|
||||||
|
PrintAndLogEx(NORMAL, " " _BLUE_("%s%s%s%s%s%s%s %s%s%s%s %s%s%s%s %s%s%s%s%s "),sq,sq,sq,sq,sq,sq,tr,sq,sq,sq,tr,sq,sq,sq,tr,sq,sq,sq,sq,tr);
|
||||||
|
PrintAndLogEx(NORMAL, " " _BLUE_("%s%s%s%s%s%s%s%s%s%s%s%s%s %s%s%s%s%s %s%s%s%s"),sq,sq,tl,hl,hl,sq,sq,tr,sq,sq,sq,sq,tr,sq,sq,sq,sq,vl,hl,hl,sq,vl);
|
||||||
|
PrintAndLogEx(NORMAL, " " _BLUE_("%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s %s%s%s%s%s%s"),sq,sq,sq,sq,sq,sq,tl,br,sq,sq,tl,sq,sq,sq,sq,tl,sq,sq,vl,sq,sq,sq,sq,tl,br);
|
||||||
|
PrintAndLogEx(NORMAL, " " _BLUE_("%s%s%s%s%s%s%s %s%s%s%s%s%s%s%s%s%s%s %s%s%s%s")"%s",sq,sq,tr,hl,hl,hl,br,sq,sq,vl,bl,sq,sq,tl,br,sq,sq,vl,hl,hl,sq,vl,msg1);
|
||||||
|
PrintAndLogEx(NORMAL, " " _BLUE_("%s%s%s %s%s%s %s%s%s %s%s%s %s%s%s%s%s%s")"%s",sq,sq,vl,sq,sq,vl,bl,hl,br,sq,sq,vl,sq,sq,sq,sq,tl,br,msg2);
|
||||||
|
PrintAndLogEx(NORMAL, " " _BLUE_("%s%s%s %s%s%s %s%s%s %s%s%s%s%s ")"%s",bl,hl,br,bl,hl,br,bl,hl,br,bl,hl,hl,hl,br,msg3);
|
||||||
|
|
||||||
|
PrintAndLogEx(NORMAL, "");
|
||||||
|
fflush(stdout);
|
||||||
|
g_printAndLog = PRINTANDLOG_PRINT | PRINTANDLOG_LOG;
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
static void showBanner(void) {
|
static void showBanner(void) {
|
||||||
|
|
||||||
|
#ifdef _WIN32
|
||||||
|
// If on windows and using UTF-8 then we need utf-8 ascii art for banner.
|
||||||
|
if (GetConsoleCP() == 65001) {
|
||||||
|
utf8_showBanner ();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
g_printAndLog = PRINTANDLOG_PRINT;
|
g_printAndLog = PRINTANDLOG_PRINT;
|
||||||
|
|
||||||
PrintAndLogEx(NORMAL, "\n");
|
PrintAndLogEx(NORMAL, "\n");
|
||||||
|
|
@ -60,6 +105,7 @@ static void showBanner(void) {
|
||||||
g_printAndLog = PRINTANDLOG_PRINT | PRINTANDLOG_LOG;
|
g_printAndLog = PRINTANDLOG_PRINT | PRINTANDLOG_LOG;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static int check_comm(void) {
|
static int check_comm(void) {
|
||||||
// If communications thread goes down. Device disconnected then this should hook up PM3 again.
|
// If communications thread goes down. Device disconnected then this should hook up PM3 again.
|
||||||
if (IsCommunicationThreadDead() && session.pm3_present) {
|
if (IsCommunicationThreadDead() && session.pm3_present) {
|
||||||
|
|
@ -493,7 +539,7 @@ finish2:
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifndef USE_SETTING_FILE
|
#ifndef USE_PREFERENCE_FILE
|
||||||
|
|
||||||
// Check if windows AnsiColor Support is enabled in the registery
|
// Check if windows AnsiColor Support is enabled in the registery
|
||||||
// [HKEY_CURRENT_USER\Console]
|
// [HKEY_CURRENT_USER\Console]
|
||||||
|
|
@ -591,11 +637,14 @@ int main(int argc, char *argv[]) {
|
||||||
set_my_executable_path();
|
set_my_executable_path();
|
||||||
set_my_user_directory();
|
set_my_user_directory();
|
||||||
|
|
||||||
#ifdef USE_SETTING_FILE
|
#ifdef USE_PREFERENCE_FILE
|
||||||
// Load Settings and assign
|
// Load Settings and assign
|
||||||
// This will allow the command line to override the settings.json values
|
// This will allow the command line to override the settings.json values
|
||||||
settings_load ();
|
preferences_load ();
|
||||||
|
// Change height/width (Rows,Cols) - Testing
|
||||||
|
// printf ("\e[8;50;100t");
|
||||||
|
// printf ("\e[3;50;50t"); // x,y
|
||||||
|
//printf ("Path : %s \n",my_user_directory);
|
||||||
// quick patch for debug level
|
// quick patch for debug level
|
||||||
g_debugMode = session.client_debug_level;
|
g_debugMode = session.client_debug_level;
|
||||||
// settings_save ();
|
// settings_save ();
|
||||||
|
|
@ -780,7 +829,7 @@ int main(int argc, char *argv[]) {
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifndef USE_SETTING_FILE
|
#ifndef USE_PREFERENCE_FILE
|
||||||
// comment next 2 lines to use session values set from settings_load
|
// comment next 2 lines to use session values set from settings_load
|
||||||
session.supports_colors = DetectWindowsAnsiSupport();
|
session.supports_colors = DetectWindowsAnsiSupport();
|
||||||
session.emoji_mode = ALTTEXT;
|
session.emoji_mode = ALTTEXT;
|
||||||
|
|
@ -854,12 +903,12 @@ int main(int argc, char *argv[]) {
|
||||||
if (!script_cmds_file && !script_cmd && session.stdinOnTTY && session.stdoutOnTTY && !flash_mode)
|
if (!script_cmds_file && !script_cmd && session.stdinOnTTY && session.stdoutOnTTY && !flash_mode)
|
||||||
showBanner();
|
showBanner();
|
||||||
|
|
||||||
#ifdef USE_SETTING_FILE
|
#ifdef USE_PREFERENCE_FILE
|
||||||
// Save settings if not load from settings json file.
|
// Save settings if not load from settings json file.
|
||||||
// Doing this here will ensure other checks and updates are saved to over rule default
|
// Doing this here will ensure other checks and updates are saved to over rule default
|
||||||
// e.g. Linux color use check
|
// e.g. Linux color use check
|
||||||
if (!session.settings_loaded)
|
if (!session.preferences_loaded)
|
||||||
settings_save ();
|
preferences_save ();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef HAVE_GUI
|
#ifdef HAVE_GUI
|
||||||
|
|
|
||||||
|
|
@ -1,211 +0,0 @@
|
||||||
/*****************************************************************************
|
|
||||||
* WARNING
|
|
||||||
*
|
|
||||||
* THIS CODE IS CREATED FOR EXPERIMENTATION AND EDUCATIONAL USE ONLY.
|
|
||||||
*
|
|
||||||
* USAGE OF THIS CODE IN OTHER WAYS MAY INFRINGE UPON THE INTELLECTUAL
|
|
||||||
* PROPERTY OF OTHER PARTIES, SUCH AS INSIDE SECURE AND HID GLOBAL,
|
|
||||||
* AND MAY EXPOSE YOU TO AN INFRINGEMENT ACTION FROM THOSE PARTIES.
|
|
||||||
*
|
|
||||||
* THIS CODE SHOULD NEVER BE USED TO INFRINGE PATENTS OR INTELLECTUAL PROPERTY RIGHTS.
|
|
||||||
*
|
|
||||||
*****************************************************************************
|
|
||||||
*
|
|
||||||
* This file is part of loclass. It is a reconstructon of the cipher engine
|
|
||||||
* used in iClass, and RFID techology.
|
|
||||||
*
|
|
||||||
* The implementation is based on the work performed by
|
|
||||||
* Flavio D. Garcia, Gerhard de Koning Gans, Roel Verdult and
|
|
||||||
* Milosch Meriac in the paper "Dismantling IClass".
|
|
||||||
*
|
|
||||||
* Copyright (C) 2014 Martin Holst Swende
|
|
||||||
*
|
|
||||||
* This is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License version 2 as published
|
|
||||||
* by the Free Software Foundation, or, at your option, any later version.
|
|
||||||
*
|
|
||||||
* This file is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with loclass. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*
|
|
||||||
*
|
|
||||||
****************************************************************************/
|
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
|
||||||
// Settings Functions
|
|
||||||
//-----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
|
||||||
// Notes
|
|
||||||
// To add a new setting
|
|
||||||
// Add the new setting to the session_arg_t; in ui.h
|
|
||||||
// Add the default value for the setting in the settings_load page below
|
|
||||||
// Update the settings_load_callback to load your setting into the stucture
|
|
||||||
// Update the settings_save_callback to enusre your setting gets saved when needed.
|
|
||||||
// use the setting as needed : session.<setting name>
|
|
||||||
// Can use (session.settings_loaded) to check if json settings file was used
|
|
||||||
//-----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
#include "settings.h"
|
|
||||||
#include "comms.h"
|
|
||||||
#include "emv/emvjson.h"
|
|
||||||
#include <string.h>
|
|
||||||
|
|
||||||
// Load all settings into memory (struct)
|
|
||||||
int settings_load (void) {
|
|
||||||
|
|
||||||
// Set all defaults
|
|
||||||
session.client_debug_level = OFF;
|
|
||||||
session.window_plot_xpos = 10;
|
|
||||||
session.window_plot_ypos = 30;
|
|
||||||
session.window_plot_hsize = 400;
|
|
||||||
session.window_plot_wsize = 800;
|
|
||||||
session.window_overlay_xpos = session.window_plot_xpos;
|
|
||||||
session.window_overlay_ypos = 20+session.window_plot_ypos + session.window_plot_hsize;
|
|
||||||
session.window_overlay_hsize = 200;
|
|
||||||
session.window_overlay_wsize = session.window_plot_wsize;
|
|
||||||
session.emoji_mode = ALIAS;
|
|
||||||
session.show_hints = false;
|
|
||||||
session.supports_colors = false;
|
|
||||||
|
|
||||||
// loadFileJson wants these, so pass in place holder values, though not used
|
|
||||||
// in settings load;
|
|
||||||
uint8_t dummyData = 0x00;
|
|
||||||
size_t dummyDL = 0x00;
|
|
||||||
|
|
||||||
if (loadFileJSON(settingsFilename, &dummyData, sizeof(dummyData), &dummyDL) == PM3_SUCCESS) {
|
|
||||||
session.settings_loaded = true;
|
|
||||||
}
|
|
||||||
// Note, if session.settings_loaded == false then the settings_save
|
|
||||||
// will be called in main () to save settings as set in defaults and main() checks.
|
|
||||||
|
|
||||||
return PM3_SUCCESS;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Save all settings from memory (struct) to file
|
|
||||||
int settings_save (void) {
|
|
||||||
// Note sure if backup has value ?
|
|
||||||
char backupFilename[500];
|
|
||||||
|
|
||||||
snprintf (backupFilename,sizeof(backupFilename),"%s.bak",settingsFilename);
|
|
||||||
|
|
||||||
if (fileExists (backupFilename)) {
|
|
||||||
if (remove (backupFilename) != 0) {
|
|
||||||
PrintAndLogEx (FAILED, "Error - could not delete old settings backup file \"%s\"",backupFilename);
|
|
||||||
return PM3_ESOFT;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (fileExists (settingsFilename)) {
|
|
||||||
if (rename (settingsFilename,backupFilename) != 0) {
|
|
||||||
PrintAndLogEx (FAILED, "Error - could not backup settings file \"%s\" to \"%s\"",settingsFilename,backupFilename);
|
|
||||||
return PM3_ESOFT;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
uint8_t dummyData = 0x00;
|
|
||||||
size_t dummyDL = 0x00;
|
|
||||||
|
|
||||||
if (saveFileJSON(settingsFilename, jsfSettings, &dummyData, dummyDL) == PM3_SUCCESS)
|
|
||||||
PrintAndLogEx (NORMAL, "settings have been saved to \"%s\"",settingsFilename);
|
|
||||||
|
|
||||||
return PM3_SUCCESS;
|
|
||||||
}
|
|
||||||
|
|
||||||
void settings_save_callback (json_t *root) {
|
|
||||||
|
|
||||||
JsonSaveStr (root,"FileType","settings");
|
|
||||||
|
|
||||||
// Log level, convert to text
|
|
||||||
switch (session.client_debug_level) {
|
|
||||||
case OFF: JsonSaveStr (root,"client.debug.level","off"); break;
|
|
||||||
case SIMPLE: JsonSaveStr (root,"client.debug.level","simple"); break;
|
|
||||||
case FULL: JsonSaveStr (root,"client.debug.level","full"); break;
|
|
||||||
default:
|
|
||||||
JsonSaveStr (root,"logging.level","NORMAL");
|
|
||||||
}
|
|
||||||
|
|
||||||
// Plot window
|
|
||||||
JsonSaveInt (root,"window.plot.xpos",session.window_plot_xpos);
|
|
||||||
JsonSaveInt (root,"window.plot.ypos",session.window_plot_ypos);
|
|
||||||
JsonSaveInt (root,"window.plot.hsize",session.window_plot_hsize);
|
|
||||||
JsonSaveInt (root,"window.plot.wsize",session.window_plot_wsize);
|
|
||||||
|
|
||||||
// Overlay/Slider window
|
|
||||||
JsonSaveInt (root,"window.overlay.xpos",session.window_overlay_xpos);
|
|
||||||
JsonSaveInt (root,"window.overlay.ypos",session.window_overlay_ypos);
|
|
||||||
JsonSaveInt (root,"window.overlay.hsize",session.window_overlay_hsize);
|
|
||||||
JsonSaveInt (root,"window.overlay.wsize",session.window_overlay_wsize);
|
|
||||||
|
|
||||||
// Emoji
|
|
||||||
switch (session.emoji_mode) {
|
|
||||||
case ALIAS: JsonSaveStr (root,"show.emoji","alias"); break;
|
|
||||||
case EMOJI: JsonSaveStr (root,"show.emoji","emoji"); break;
|
|
||||||
case ALTTEXT: JsonSaveStr (root,"show.emoji","alttext"); break;
|
|
||||||
case ERASE: JsonSaveStr (root,"show.emoji","erase"); break;
|
|
||||||
default:
|
|
||||||
JsonSaveStr (root,"show.emoji","ALIAS");
|
|
||||||
}
|
|
||||||
|
|
||||||
JsonSaveBoolean (root,"show.hints",session.show_hints);
|
|
||||||
|
|
||||||
JsonSaveBoolean (root,"os.supports.colors",session.supports_colors);
|
|
||||||
}
|
|
||||||
|
|
||||||
void settings_load_callback (json_t *root) {
|
|
||||||
json_error_t up_error = {0};
|
|
||||||
bool b1;
|
|
||||||
int i1;
|
|
||||||
const char *s1;
|
|
||||||
char tempStr [500]; // to use str_lower() since json unpack uses const char *
|
|
||||||
|
|
||||||
// Logging Level
|
|
||||||
if (json_unpack_ex(root,&up_error, 0, "{s:s}","client.debug.level",&s1) == 0) {
|
|
||||||
strncpy (tempStr,s1,sizeof(tempStr)-1);
|
|
||||||
str_lower (tempStr);
|
|
||||||
if (strncmp (tempStr,"off",3) == 0) session.client_debug_level = OFF;
|
|
||||||
if (strncmp (tempStr,"simple",6) == 0) session.client_debug_level = SIMPLE;
|
|
||||||
if (strncmp (tempStr,"full",4) == 0) session.client_debug_level = FULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
// window plot
|
|
||||||
if (json_unpack_ex(root,&up_error, 0, "{s:i}","window.plot.xpos",&i1) == 0)
|
|
||||||
session.window_plot_xpos = i1;
|
|
||||||
if (json_unpack_ex(root,&up_error, 0, "{s:i}","window.plot.ypos",&i1) == 0)
|
|
||||||
session.window_plot_ypos = i1;
|
|
||||||
if (json_unpack_ex(root,&up_error, 0, "{s:i}","window.plot.hsize",&i1) == 0)
|
|
||||||
session.window_plot_hsize = i1;
|
|
||||||
if (json_unpack_ex(root,&up_error, 0, "{s:i}","window.plot.wsize",&i1) == 0)
|
|
||||||
session.window_plot_wsize = i1;
|
|
||||||
|
|
||||||
// overlay/slider plot
|
|
||||||
if (json_unpack_ex(root,&up_error, 0, "{s:i}","window.overlay.xpos",&i1) == 0)
|
|
||||||
session.window_overlay_xpos = i1;
|
|
||||||
if (json_unpack_ex(root,&up_error, 0, "{s:i}","window.overlay.ypos",&i1) == 0)
|
|
||||||
session.window_overlay_ypos = i1;
|
|
||||||
if (json_unpack_ex(root,&up_error, 0, "{s:i}","window.overlay.hsize",&i1) == 0)
|
|
||||||
session.window_overlay_hsize = i1;
|
|
||||||
if (json_unpack_ex(root,&up_error, 0, "{s:i}","window.overlay.wsize",&i1) == 0)
|
|
||||||
session.window_overlay_wsize = i1;
|
|
||||||
|
|
||||||
// show options
|
|
||||||
if (json_unpack_ex(root,&up_error, 0, "{s:s}","show.emoji",&s1) == 0) {
|
|
||||||
strncpy (tempStr,s1,sizeof(tempStr)-1);
|
|
||||||
str_lower (tempStr);
|
|
||||||
if (strncmp (tempStr,"alias",5) == 0) session.emoji_mode = ALIAS;
|
|
||||||
if (strncmp (tempStr,"emoji",5) == 0) session.emoji_mode = EMOJI;
|
|
||||||
if (strncmp (tempStr,"alttext",7) == 0) session.emoji_mode = ALTTEXT;
|
|
||||||
if (strncmp (tempStr,"erase",5) == 0) session.emoji_mode = ERASE;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (json_unpack_ex(root,&up_error, 0, "{s:b}","show.hints",&b1) == 0)
|
|
||||||
session.show_hints = b1;
|
|
||||||
|
|
||||||
if (json_unpack_ex(root,&up_error, 0, "{s:b}","os.supports.colors",&b1) == 0)
|
|
||||||
session.supports_colors = b1;
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
@ -22,7 +22,7 @@ typedef enum emojiMode {ALIAS, EMOJI, ALTTEXT, ERASE} emojiMode_t;
|
||||||
typedef enum clientdebugLevel {OFF,SIMPLE,FULL} clientdebugLevel_t;
|
typedef enum clientdebugLevel {OFF,SIMPLE,FULL} clientdebugLevel_t;
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
bool settings_loaded;
|
bool preferences_loaded;
|
||||||
bool stdinOnTTY;
|
bool stdinOnTTY;
|
||||||
bool stdoutOnTTY;
|
bool stdoutOnTTY;
|
||||||
bool supports_colors;
|
bool supports_colors;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue