Merge pull request #702 from OpenEVSE/jeremypoulter/issue643

glynhudson · web-flow · commit 888c5c4d5ec9 · 2023-08-30T11:16:17.000+01:00
Block all RAPI commands that are not the read only `$G...` ones
diff --git a/src/evse_man.cpp b/src/evse_man.cpp
@@ -423,7 +423,7 @@ bool EvseManager::claim(EvseClient client, int priority, EvseProperties &target)
   {
     DBUGF("Found slot");
     if(slot->claim(client, priority, target))
-    { 
+    {
       DBUGF("Claim added/updated, waking task");
       _evaluateClaims = true;
       MicroTask.wakeTask(this);
@@ -603,7 +603,11 @@ void EvseManager::setMaxConfiguredCurrent(long amps)
 
 bool EvseManager::isRapiCommandBlocked(String rapi)
 {
-  return rapi.startsWith("$ST");
+#ifdef ENABLE_FULL_RAPI
+  return false;
+#else
+  return !rapi.startsWith("$G");
+#endif
 }
 
 bool EvseManager::serializeClaims(DynamicJsonDocument &doc)

Original file line number	Diff line number	Diff line change
`@@ -423,7 +423,7 @@ bool EvseManager::claim(EvseClient client, int priority, EvseProperties &target)`
`423`	`423`	`{`
`424`	`424`	`DBUGF("Found slot");`
`425`	`425`	`if(slot->claim(client, priority, target))`
`426`		`- {`
	`426`	`+ {`
`427`	`427`	`DBUGF("Claim added/updated, waking task");`
`428`	`428`	`_evaluateClaims = true;`
`429`	`429`	`MicroTask.wakeTask(this);`
`@@ -603,7 +603,11 @@ void EvseManager::setMaxConfiguredCurrent(long amps)`
`603`	`603`
`604`	`604`	`bool EvseManager::isRapiCommandBlocked(String rapi)`
`605`	`605`	`{`
`606`		`- return rapi.startsWith("$ST");`
	`606`	`+#ifdef ENABLE_FULL_RAPI`
	`607`	`+ return false;`
	`608`	`+#else`
	`609`	`+ return !rapi.startsWith("$G");`
	`610`	`+#endif`
`607`	`611`	`}`
`608`	`612`
`609`	`613`	`bool EvseManager::serializeClaims(DynamicJsonDocument &doc)`