andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-06 15:59:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

added show users command - #435

Browse Source
This commit is contained in:
proddy
2020-07-25 18:24:45 +02:00
parent a09dd3b735
commit 61a711c8f6
3 changed files with 28 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@@ -82,6 +82,7 @@ system
set set
show show
show mqtt show mqtt
show users
passwd passwd
restart restart
set wifi hostname <name> set wifi hostname <name>

32
src/system.cpp
View File

@@ -26,6 +26,7 @@ MAKE_PSTR_WORD(hostname)
MAKE_PSTR_WORD(wifi) MAKE_PSTR_WORD(wifi)
MAKE_PSTR_WORD(ssid) MAKE_PSTR_WORD(ssid)
MAKE_PSTR_WORD(heartbeat) MAKE_PSTR_WORD(heartbeat)
MAKE_PSTR_WORD(users)
MAKE_PSTR(host_fmt, "Host = %s") MAKE_PSTR(host_fmt, "Host = %s")
MAKE_PSTR(hostname_fmt, "WiFi Hostname = %s") MAKE_PSTR(hostname_fmt, "WiFi Hostname = %s")
@@ -221,17 +222,15 @@ void System::start() {
} }
// fetch settings // fetch settings
std::string hostname;
EMSESP::emsespSettingsService.read([&](EMSESPSettings & settings) { tx_mode_ = settings.tx_mode; }); EMSESP::emsespSettingsService.read([&](EMSESPSettings & settings) { tx_mode_ = settings.tx_mode; });
EMSESP::esp8266React.getMqttSettingsService()->read([&](MqttSettings & settings) { system_heartbeat_ = settings.system_heartbeat; }); EMSESP::esp8266React.getMqttSettingsService()->read([&](MqttSettings & settings) { system_heartbeat_ = settings.system_heartbeat; });
EMSESP::esp8266React.getWiFiSettingsService()->read(
[&](WiFiSettings & wifiSettings) { LOG_INFO(F("System %s booted (EMS-ESP version %s)"), wifiSettings.hostname, EMSESP_APP_VERSION); });
syslog_.log_level((uuid::log::Level)syslog_level_);
syslog_init(); // init SysLog syslog_init(); // init SysLog
#if defined(ESP32)
LOG_INFO(F("System booted (EMS-ESP version %s ESP32)"), EMSESP_APP_VERSION);
#else
LOG_INFO(F("System booted (EMS-ESP version %s)"), EMSESP_APP_VERSION);
#endif
if (LED_GPIO) { if (LED_GPIO) {
pinMode(LED_GPIO, OUTPUT); // LED pin, 0 means disabled pinMode(LED_GPIO, OUTPUT); // LED pin, 0 means disabled
} }
@@ -372,6 +371,19 @@ int8_t System::wifi_quality() {
return 2 * (dBm + 100); return 2 * (dBm + 100);
} }
// print users to console
void System::show_users(uuid::console::Shell & shell) {
shell.printfln(F("Users:"));
EMSESP::esp8266React.getSecuritySettingsService()->read([&](SecuritySettings & securitySettings) {
for (User user : securitySettings.users) {
shell.printfln(F(" username: %s password: %s is_admin: %s"), user.username, user.password, user.admin ? "yes" : "no");
}
});
shell.println();
}
void System::show_system(uuid::console::Shell & shell) { void System::show_system(uuid::console::Shell & shell) {
shell.printfln(F("Uptime: %s"), uuid::log::format_timestamp_ms(uuid::get_uptime_ms(), 3).c_str()); shell.printfln(F("Uptime: %s"), uuid::log::format_timestamp_ms(uuid::get_uptime_ms(), 3).c_str());
@@ -609,6 +621,11 @@ void System::console_commands(Shell & shell, unsigned int context) {
flash_string_vector{F_(show), F_(mqtt)}, flash_string_vector{F_(show), F_(mqtt)},
[](Shell & shell, const std::vector<std::string> & arguments __attribute__((unused))) { Mqtt::show_mqtt(shell); }); [](Shell & shell, const std::vector<std::string> & arguments __attribute__((unused))) { Mqtt::show_mqtt(shell); });
EMSESPShell::commands->add_command(ShellContext::SYSTEM,
CommandFlags::ADMIN,
flash_string_vector{F_(show), F_(users)},
[](Shell & shell, const std::vector<std::string> & arguments __attribute__((unused))) { System::show_users(shell); });
// enter the context // enter the context
Console::enter_custom_context(shell, context); Console::enter_custom_context(shell, context);
@@ -618,8 +635,7 @@ void System::console_commands(Shell & shell, unsigned int context) {
void System::check_upgrade() { void System::check_upgrade() {
// check for v1.9. It uses SPIFFS and only on the ESP8266 // check for v1.9. It uses SPIFFS and only on the ESP8266
#if defined(ESP8266) #if defined(ESP8266)
Serial.begin(115200); // TODO remove, just for debugging
Serial.begin(115200); // TODO remove
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wdeprecated-declarations"

5
src/system.h
View File

@@ -50,8 +50,8 @@ class System {
static void mqtt_commands(const char * message); static void mqtt_commands(const char * message);
static uint8_t free_mem(); static uint8_t free_mem();
static void upload_status(bool in_progress); static void upload_status(bool in_progress);
static bool upload_status(); static bool upload_status();
void syslog_init(); void syslog_init();
@@ -97,6 +97,7 @@ class System {
void system_check(); void system_check();
static void show_system(uuid::console::Shell & shell); static void show_system(uuid::console::Shell & shell);
static void show_users(uuid::console::Shell & shell);
static int8_t wifi_quality(); static int8_t wifi_quality();
bool system_healthy_ = false; bool system_healthy_ = false;