add possibility to disable auto restart in config file

indigo-dc · Aug 26, 2024 · 95a7089 · 95a7089
1 parent b06f03e
commit 95a7089
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 9 deletions.
diff --git a/src/defines/agent_values.h b/src/defines/agent_values.h
@@ -51,6 +51,7 @@
 #define CONFIG_KEY_STATSCOLLECT "stats_collect_local"
 #define CONFIG_KEY_STATSCOLLECTSHARE "stats_collect_share"
 #define CONFIG_KEY_STATSCOLLECTLOCATION "stats_collect_location"
+#define CONFIG_KEY_RESTARTAFTERUPDATE "restart_after_update"
 #define CONFIG_KEY_LEGACYAUDMODE "legacy_aud_mode"
 #define CONFIG_KEY_PLAINADD "skip-check"
 

diff --git a/src/oidc-agent/oidcp/oidcp.c b/src/oidc-agent/oidcp/oidcp.c
@@ -32,6 +32,7 @@
 #include "oidc-agent/stats/statlogger.h"
 #include "oidc-gen/promptAndSet/name.h"
 #include "utils/agentLogger.h"
+#include "utils/config/agent_config.h"
 #include "utils/config/gen_config.h"
 #include "utils/config/issuerConfig.h"
 #include "utils/crypt/crypt.h"
@@ -288,15 +289,16 @@ int main(int argc, char** argv) {
  }
 
  set_prompt_mode(PROMPT_MODE_GUI);
+ int inotify_fd = -1;
 #ifdef __linux__
- set_restart_agent_args(argc, argv);
- int inotify_fd = inotify_watch(AGENT_PATH);
- if (inotify_fd < 0) {
- agent_log(ERROR, "%s", oidc_serror());
- exit(EXIT_FAILURE);
+ if (getAgentConfig()->restart_after_update) {
+ set_restart_agent_args(argc, argv);
+ inotify_fd = inotify_watch(AGENT_PATH);
+ if (inotify_fd < 0) {
+ agent_log(ERROR, "%s", oidc_serror());
+ exit(EXIT_FAILURE);
+ }
  }
-#else
- int inotify_fd = -1;
 #endif
  handleClientComm(pipes, inotify_fd, &arguments, parent_alive_interval);
 }

diff --git a/src/utils/config/agent_config.c b/src/utils/config/agent_config.c
@@ -33,7 +33,8 @@ static agent_config_t* _getAgentConfig(const char* json) {
  CONFIG_KEY_DEBUGLOGGING, IPC_KEY_LIFETIME, CONFIG_KEY_GROUP,
  IPC_KEY_ALWAYSALLOWID, CONFIG_KEY_AUTOGEN,
  CONFIG_KEY_AUTOGENSCOPEMODE, CONFIG_KEY_STATSCOLLECT,
- CONFIG_KEY_STATSCOLLECTSHARE, CONFIG_KEY_STATSCOLLECTLOCATION);
+ CONFIG_KEY_STATSCOLLECTSHARE, CONFIG_KEY_STATSCOLLECTLOCATION,
+ CONFIG_KEY_RESTARTAFTERUPDATE);
  if (getJSONValuesFromString(json, pairs, sizeof(pairs) / sizeof(*pairs)) <
  0) {
  SEC_FREE_KEY_VALUES();
@@ -43,7 +44,8 @@ static agent_config_t* _getAgentConfig(const char* json) {
  KEY_VALUE_VARS(cert_path, bind_address, confirm, autoload, autoreauth,
  customurischeme, webserver, debug, lifetime, group,
  alwaysallowidtoken, autogen, autogenscopemode, stats_collect,
- stats_collect_share, stats_collect_location);
+ stats_collect_share, stats_collect_location,
+ restart_after_update);
  agent_config_t* c = secAlloc(sizeof(agent_config_t));
  c->cert_path = oidc_strcopy(_cert_path);
  c->bind_address = oidc_strcopy(_bind_address);
@@ -58,6 +60,9 @@ static agent_config_t* _getAgentConfig(const char* json) {
  c->stats_collect = strToBit(_stats_collect);
  c->stats_collect_share = strToBit(_stats_collect_share);
  c->stats_collect_location = strToBit(_stats_collect_location);
+ c->restart_after_update = strValid(_restart_after_update)
+ ? strToBit(_restart_after_update)
+ : 1; // default is on
  if (strValid(_autogenscopemode)) {
  if (strcaseequal(_autogenscopemode, CONFIG_VALUE_SCOPEMODE_EXACT)) {
  c->autogenscopemode = AGENTCONFIG_AUTOGENSCOPEMODE_EXACT;

diff --git a/src/utils/config/agent_config.h b/src/utils/config/agent_config.h
@@ -23,6 +23,7 @@ struct agent_config {
  unsigned char stats_collect : 1;
  unsigned char stats_collect_share : 1;
  unsigned char stats_collect_location : 1;
+ unsigned char restart_after_update : 1;
  time_t lifetime;
  char* group;
 };