[agent] feat(multi-tenancy): add tenant id (#4864)

config/default.toml

@@ -7,4 +7,5 @@ unsecured_certificate = false
 with_proxy = false
 installation_mode= "session-user"
 service_name = "OAEVAgentService"
-service_full_name = "OAEVAgentService"
+service_full_name = "OAEVAgentService"
+tenant_id = "2cffad3a-0001-4078-b0e2-ef74274022c3"

installer/linux/agent-installer-service-user.sh

@@ -55,6 +55,7 @@ os=$(uname | tr '[:upper:]' '[:lower:]')
 systemd_status=$(systemctl is-system-running)
 install_dir="$HOME/${OPENAEV_INSTALL_DIR}-${user}"
 service_name="${user}-${OPENAEV_SERVICE_NAME}"
+tenant_id="${OPENAEV_TENANT_ID}"
 
 
 if [ "${os}" != "linux" ]; then
@@ -76,7 +77,7 @@ systemctl stop ${service_name} || echo "Fail stopping ${service_name}"
 
 echo "02. Downloading OpenAEV Agent into ${install_dir}..."
 (mkdir -p ${install_dir} && touch ${install_dir} >/dev/null 2>&1) || (echo -n "\nFatal: Can't write to ${install_dir}\n" >&2 && exit 1)
-curl -sSfL ${base_url}/api/agent/executable/openaev/${os}/${architecture} -o ${install_dir}/openaev-agent
+curl -sSfL ${base_url}/api/tenants/${tenant_id}/agent/executable/openaev/${os}/${architecture} -o ${install_dir}/openaev-agent
 chmod +x ${install_dir}/openaev-agent
 
 echo "03. Creating OpenAEV configuration file"
@@ -90,6 +91,7 @@ unsecured_certificate = "${OPENAEV_UNSECURED_CERTIFICATE}"
 with_proxy = "${OPENAEV_WITH_PROXY}"
 installation_mode = "service-user"
 service_name = "${OPENAEV_SERVICE_NAME}"
+tenant_id = "${OPENAEV_TENANT_ID}"
 EOF
 
 echo "04. Writing agent service"

installer/linux/agent-installer-session-user.sh

@@ -9,6 +9,7 @@ os=$(uname | tr '[:upper:]' '[:lower:]')
 install_dir="$HOME/${OPENAEV_INSTALL_DIR}"
 session_name="${OPENAEV_SERVICE_NAME}"
 systemd_unit_dir="$HOME/.config/systemd/user/"
+tenant_id="${OPENAEV_TENANT_ID}"
 
 if [ "${os}" != "linux" ]; then
   echo "Operating system $OSTYPE is not supported yet, please create a ticket in openaev github project"
@@ -30,7 +31,7 @@ systemctl --user stop ${session_name} || echo "Fail stopping ${session_name}"
 
 echo "02. Downloading OpenAEV Agent into ${install_dir}..."
 (mkdir -p ${install_dir} && touch ${install_dir} >/dev/null 2>&1) || (echo -n "\nFatal: Can't write to ${install_dir}\n" >&2 && exit 1)
-curl -sSfL ${base_url}/api/agent/executable/openaev/${os}/${architecture} -o ${install_dir}/openaev-agent
+curl -sSfL ${base_url}/api/tenants/${tenant_id}/agent/executable/openaev/${os}/${architecture} -o ${install_dir}/openaev-agent
 chmod +x ${install_dir}/openaev-agent
 
 echo "03. Creating OpenAEV configuration file"
@@ -44,6 +45,7 @@ unsecured_certificate = "${OPENAEV_UNSECURED_CERTIFICATE}"
 with_proxy = "${OPENAEV_WITH_PROXY}"
 installation_mode = "session-user"
 service_name = "${OPENAEV_SERVICE_NAME}"
+tenant_id = "${OPENAEV_TENANT_ID}"
 EOF
 
 echo "04. Writing agent service"

installer/linux/agent-installer.sh

@@ -8,6 +8,7 @@ systemd_status=$(systemctl is-system-running)
 os=$(uname | tr '[:upper:]' '[:lower:]')
 install_dir="${OPENAEV_INSTALL_DIR}"
 service_name="${OPENAEV_SERVICE_NAME}"
+tenant_id="${OPENAEV_TENANT_ID}"
 
 if [ "${os}" != "linux" ]; then
   echo "Operating system $OSTYPE is not supported yet, please create a ticket in openaev github project"
@@ -28,7 +29,7 @@ systemctl stop ${service_name} || echo "Fail stopping ${service_name}"
 
 echo "02. Downloading OpenAEV Agent into ${install_dir}..."
 (mkdir -p ${install_dir} && touch ${install_dir} >/dev/null 2>&1) || (echo -n "\nFatal: Can't write to ${install_dir}\n" >&2 && exit 1)
-curl -sSfL ${base_url}/api/agent/executable/openaev/${os}/${architecture} -o ${install_dir}/openaev-agent
+curl -sSfL ${base_url}/api/tenants/${tenant_id}/agent/executable/openaev/${os}/${architecture} -o ${install_dir}/openaev-agent
 chmod 755 ${install_dir}/openaev-agent
 
 echo "03. Creating OpenAEV configuration file"
@@ -42,6 +43,7 @@ unsecured_certificate = "${OPENAEV_UNSECURED_CERTIFICATE}"
 with_proxy = "${OPENAEV_WITH_PROXY}"
 installation_mode = "service"
 service_name = "${OPENAEV_SERVICE_NAME}"
+tenant_id = "${OPENAEV_TENANT_ID}"
 EOF
 
 echo "04. Writing agent service"

installer/linux/agent-upgrade-service-user.sh

@@ -7,6 +7,7 @@ systemd_status=$(systemctl is-system-running)
 
 os=$(uname | tr '[:upper:]' '[:lower:]')
 session_name="${OPENAEV_SERVICE_NAME}"
+tenant_id="${OPENAEV_TENANT_ID}"
 
 # Check if OPENAEV_INSTALL_DIR is an absolute path (starts with /)
 case "${OPENAEV_INSTALL_DIR}" in
@@ -35,7 +36,7 @@ fi
 echo "Starting upgrade script for ${os} | ${architecture}"
 
 echo "01. Downloading OpenAEV Agent into ${install_dir}..."
-curl -sSfL ${base_url}/api/agent/executable/openaev/${os}/${architecture} -o ${install_dir}/openaev-agent_upgrade
+curl -sSfL ${base_url}/api/tenants/${tenant_id}/agent/executable/openaev/${os}/${architecture} -o ${install_dir}/openaev-agent_upgrade
 mv ${install_dir}/openaev-agent_upgrade ${install_dir}/openaev-agent
 chmod +x ${install_dir}/openaev-agent
 
@@ -50,6 +51,7 @@ unsecured_certificate = "${OPENAEV_UNSECURED_CERTIFICATE}"
 with_proxy = "${OPENAEV_WITH_PROXY}"
 installation_mode = "session-user"
 service_name = "${OPENAEV_SERVICE_NAME}"
+tenant_id = "${OPENAEV_TENANT_ID}"
 EOF
 
 echo "03. Restarting the service"

installer/linux/agent-upgrade-session-user.sh

@@ -7,6 +7,7 @@ systemd_status=$(systemctl is-system-running)
 
 os=$(uname | tr '[:upper:]' '[:lower:]')
 session_name="${OPENAEV_SERVICE_NAME}"
+tenant_id="${OPENAEV_TENANT_ID}"
 
 # Check if OPENAEV_INSTALL_DIR is an absolute path (starts with /)
 case "${OPENAEV_INSTALL_DIR}" in
@@ -40,7 +41,7 @@ if [ -d "$openaev_dir" ]; then
 # Upgrade the agent if the folder *openaev* exists
 
 echo "01. Downloading OpenAEV Agent into ${install_dir}..."
-curl -sSfL ${base_url}/api/agent/executable/openaev/${os}/${architecture} -o ${install_dir}/openaev-agent_upgrade
+curl -sSfL ${base_url}/api/tenants/${tenant_id}/agent/executable/openaev/${os}/${architecture} -o ${install_dir}/openaev-agent_upgrade
 mv ${install_dir}/openaev-agent_upgrade ${install_dir}/openaev-agent
 chmod +x ${install_dir}/openaev-agent
 
@@ -55,6 +56,7 @@ unsecured_certificate = "${OPENAEV_UNSECURED_CERTIFICATE}"
 with_proxy = "${OPENAEV_WITH_PROXY}"
 installation_mode = "session-user"
 service_name = "${OPENAEV_SERVICE_NAME}"
+tenant_id = "${OPENAEV_TENANT_ID}"
 EOF
 
 echo "03. Restarting the service"
@@ -64,7 +66,7 @@ else
 # Uninstall the old named agent *openbas* and install the new named agent *openaev* if the folder openaev doesn't exist
 echo "01. Installing OpenAEV Agent..."
 openaev_session=$(printf %s "${session_name}" | sed 's/openbas/openaev/g')
-curl -sSfLG ${base_url}/api/agent/installer/openaev/${os}/session-user/${OPENAEV_TOKEN} --data-urlencode "installationDir=${openaev_dir}" --data-urlencode "serviceName=${openaev_session}" | sh
+curl -sSfLG ${base_url}/api/tenants/${tenant_id}/agent/installer/openaev/${os}/session-user/${OPENAEV_TOKEN} --data-urlencode "installationDir=${openaev_dir}" --data-urlencode "serviceName=${openaev_session}" | sh
 
 echo "02. Uninstalling OpenBAS Agent..."
 (

installer/linux/agent-upgrade.sh

@@ -8,6 +8,7 @@ systemd_status=$(systemctl is-system-running)
 os=$(uname | tr '[:upper:]' '[:lower:]')
 install_dir="${OPENAEV_INSTALL_DIR}"
 service_name="${OPENAEV_SERVICE_NAME}"
+tenant_id="${OPENAEV_TENANT_ID}"
 
 if [ "${os}" != "linux" ]; then
   echo "Operating system ${os} is not supported yet, please create a ticket in openaev github project"
@@ -29,7 +30,7 @@ if [ -d "$openaev_dir" ]; then
 # Upgrade the agent if the folder *openaev* exists
 
 echo "01. Downloading OpenAEV Agent into ${install_dir}..."
-curl -sSfL ${base_url}/api/agent/executable/openaev/${os}/${architecture} -o ${install_dir}/openaev-agent_upgrade
+curl -sSfL ${base_url}/api/tenants/${tenant_id}/agent/executable/openaev/${os}/${architecture} -o ${install_dir}/openaev-agent_upgrade
 mv ${install_dir}/openaev-agent_upgrade ${install_dir}/openaev-agent
 chmod 755 ${install_dir}/openaev-agent
 
@@ -45,6 +46,7 @@ unsecured_certificate = "${OPENAEV_UNSECURED_CERTIFICATE}"
 with_proxy = "${OPENAEV_WITH_PROXY}"
 installation_mode = "service"
 service_name = "${OPENAEV_SERVICE_NAME}"
+tenant_id = "${OPENAEV_TENANT_ID}"
 EOF
 
 echo "03. Restarting the service"
@@ -54,7 +56,7 @@ else
 # Uninstall the old named agent *openbas* and install the new named agent *openaev* if the folder openaev doesn't exist
 echo "01. Installing OpenAEV Agent..."
 openaev_service=$(printf %s "${service_name}" | sed 's/openbas/openaev/g')
-curl -sSfLG ${base_url}/api/agent/installer/openaev/${os}/service/${OPENAEV_TOKEN} --data-urlencode "installationDir=${openaev_dir}" --data-urlencode "serviceName=${openaev_service}" | sh
+curl -sSfLG ${base_url}/api/tenants/${tenant_id}/agent/installer/openaev/${os}/service/${OPENAEV_TOKEN} --data-urlencode "installationDir=${openaev_dir}" --data-urlencode "serviceName=${openaev_service}" | sh
 
 echo "02. Uninstalling OpenBAS Agent..."
 (

installer/macos/agent-installer-service-user.sh

@@ -54,6 +54,7 @@ uid=$(id -u ${user})
 
 install_dir="${OPENAEV_INSTALL_DIR}-${user}"
 service_name="${user}-${OPENAEV_SERVCICE_NAME}"
+tenant_id="${OPENAEV_TENANT_ID}"
 
 os=$(uname | tr '[:upper:]' '[:lower:]')
 if [ "${os}" = "darwin" ]; then
@@ -72,7 +73,7 @@ launchctl bootout gui/${uid} /Library/LaunchAgents/${service_name}.plist || echo
 
 echo "02. Downloading OpenAEV Agent into ${install_dir}..."
 (mkdir -p ${install_dir} && touch ${install_dir} >/dev/null 2>&1) || (echo -n "\nFatal: Can't write to ${install_dir}\n" >&2 && exit 1)
-curl -sSfL ${base_url}/api/agent/executable/openaev/${os}/${architecture} -o ${install_dir}/openaev-agent
+curl -sSfL ${base_url}/api/tenants/${tenant_id}/agent/executable/openaev/${os}/${architecture} -o ${install_dir}/openaev-agent
 chmod +x ${install_dir}/openaev-agent
 
 echo "03. Creating OpenAEV configuration file"
@@ -86,6 +87,7 @@ unsecured_certificate = "${OPENAEV_UNSECURED_CERTIFICATE}"
 with_proxy = "${OPENAEV_WITH_PROXY}"
 installation_mode = "service-user"
 service_name = "${OPENAEV_SERVICE_NAME}"
+tenant_id = "${OPENAEV_TENANT_ID}"
 EOF
 
 echo "04. Writing agent service"

installer/macos/agent-installer-session-user.sh

@@ -6,6 +6,7 @@ architecture=$(uname -m)
 
 install_dir="/Users/$(id -un)/${OPENAEV_INSTALL_DIR}"
 session_name="${OPENAEV_SERVICE_NAME}"
+tenant_id="${OPENAEV_TENANT_ID}"
 
 os=$(uname | tr '[:upper:]' '[:lower:]')
 if [ "${os}" = "darwin" ]; then
@@ -24,7 +25,7 @@ launchctl bootout gui/$(id -u) ~/Library/LaunchAgents/${session_name}.plist || e
 
 echo "02. Downloading OpenAEV Agent into ${install_dir}..."
 (mkdir -p ${install_dir} && touch ${install_dir} >/dev/null 2>&1) || (echo -n "\nFatal: Can't write to ${install_dir}\n" >&2 && exit 1)
-curl -sSfL ${base_url}/api/agent/executable/openaev/${os}/${architecture} -o ${install_dir}/openaev-agent
+curl -sSfL ${base_url}/api/tenants/${tenant_id}/agent/executable/openaev/${os}/${architecture} -o ${install_dir}/openaev-agent
 chmod +x ${install_dir}/openaev-agent
 
 echo "03. Creating OpenAEV configuration file"
@@ -38,6 +39,7 @@ unsecured_certificate = "${OPENAEV_UNSECURED_CERTIFICATE}"
 with_proxy = "${OPENAEV_WITH_PROXY}"
 installation_mode = "session-user"
 service_name = "${OPENAEV_SERVICE_NAME}"
+tenant_id = "${OPENAEV_TENANT_ID}"
 EOF
 
 echo "04. Writing agent service"

installer/macos/agent-installer.sh

@@ -6,6 +6,7 @@ architecture=$(uname -m)
 
 install_dir="${OPENAEV_INSTALL_DIR}"
 service_name="${OPENAEV_SERVICE_NAME}"
+tenant_id="${OPENAEV_TENANT_ID}"
 
 os=$(uname | tr '[:upper:]' '[:lower:]')
 if [ "${os}" = "darwin" ]; then
@@ -24,7 +25,7 @@ launchctl bootout system /Library/LaunchDaemons/io.filigran.${service_name}.plis
 
 echo "02. Downloading OpenAEV Agent into ${install_dir}..."
 (mkdir -p ${install_dir} && touch ${install_dir} >/dev/null 2>&1) || (echo -n "\nFatal: Can't write to ${install_dir}\n" >&2 && exit 1)
-curl -sSfL ${base_url}/api/agent/executable/openaev/${os}/${architecture} -o ${install_dir}/openaev-agent
+curl -sSfL ${base_url}/api/tenants/${tenant_id}/agent/executable/openaev/${os}/${architecture} -o ${install_dir}/openaev-agent
 chmod 755 ${install_dir}/openaev-agent
 
 echo "03. Creating OpenAEV configuration file"
@@ -38,6 +39,7 @@ unsecured_certificate = "${OPENAEV_UNSECURED_CERTIFICATE}"
 with_proxy = "${OPENAEV_WITH_PROXY}"
 installation_mode = "service"
 service_name = "${OPENAEV_SERVICE_NAME}"
+tenant_id = "${OPENAEV_TENANT_ID}"
 EOF
 
 echo "04. Writing agent service"

installer/macos/agent-upgrade-service-user.sh

@@ -7,6 +7,7 @@ user="$(id -un)"
 group="$(id -gn)"
 
 install_dir="${OPENAEV_INSTALL_DIR}-${user}"
+tenant_id="${OPENAEV_TENANT_ID}"
 
 os=$(uname | tr '[:upper:]' '[:lower:]')
 if [ "${os}" = "darwin" ]; then
@@ -22,7 +23,7 @@ echo "Starting upgrade script for ${os} | ${architecture}"
 
 echo "01. Downloading OpenAEV Agent into ${install_dir}..."
 (mkdir -p ${install_dir} && touch ${install_dir} >/dev/null 2>&1) || (echo -n "\nFatal: Can't write to ${install_dir}\n" >&2 && exit 1)
-curl -sSfL ${base_url}/api/agent/executable/openaev/${os}/${architecture} -o ${install_dir}/openaev-agent_upgrade
+curl -sSfL ${base_url}/api/tenants/${tenant_id}/agent/executable/openaev/${os}/${architecture} -o ${install_dir}/openaev-agent_upgrade
 mv ${install_dir}/openaev-agent_upgrade ${install_dir}/openaev-agent
 chmod +x ${install_dir}/openaev-agent
 
@@ -37,6 +38,7 @@ unsecured_certificate = "${OPENAEV_UNSECURED_CERTIFICATE}"
 with_proxy = "${OPENAEV_WITH_PROXY}"
 installation_mode = "service-user"
 service_name = "${OPENAEV_SERVICE_NAME}"
+tenant_id = "${OPENAEV_TENANT_ID}"
 EOF
 
 echo "03. Kill the process of the existing service"

installer/macos/agent-upgrade-session-user.sh

@@ -6,6 +6,7 @@ architecture=$(uname -m)
 
 install_dir="${OPENAEV_INSTALL_DIR}"
 session_name="${OPENAEV_SERVICE_NAME}"
+tenant_id="${OPENAEV_TENANT_ID}"
 
 os=$(uname | tr '[:upper:]' '[:lower:]')
 if [ "${os}" = "darwin" ]; then
@@ -25,7 +26,7 @@ if [ -d "$openaev_dir" ]; then
 # Upgrade the agent if the folder *openaev* exists
 
 echo "01. Downloading OpenAEV Agent into ${install_dir}..."
-curl -sSfL ${base_url}/api/agent/executable/openaev/${os}/${architecture} -o ${install_dir}/openaev-agent_upgrade
+curl -sSfL ${base_url}/api/tenants/${tenant_id}/agent/executable/openaev/${os}/${architecture} -o ${install_dir}/openaev-agent_upgrade
 mv ${install_dir}/openaev-agent_upgrade ${install_dir}/openaev-agent
 chmod +x ${install_dir}/openaev-agent
 
@@ -40,6 +41,7 @@ unsecured_certificate = "${OPENAEV_UNSECURED_CERTIFICATE}"
 with_proxy = "${OPENAEV_WITH_PROXY}"
 installation_mode = "session-user"
 service_name = "${OPENAEV_SERVICE_NAME}"
+tenant_id = "${OPENAEV_TENANT_ID}"
 EOF
 
 echo "03. Starting agent service"
@@ -50,7 +52,7 @@ else
 # Uninstall the old named agent *openbas* and install the new named agent *openaev* if the folder openaev doesn't exist
 echo "01. Installing OpenAEV Agent..."
 openaev_session=$(printf %s "${session_name}" | sed 's/openbas/openaev/g')
-curl -sSfLG ${base_url}/api/agent/installer/openaev/${os}/session-user/${OPENAEV_TOKEN} --data-urlencode "installationDir=${openaev_dir}" --data-urlencode "serviceName=${openaev_session}" | sh
+curl -sSfLG ${base_url}/api/tenants/${tenant_id}/agent/installer/openaev/${os}/session-user/${OPENAEV_TOKEN} --data-urlencode "installationDir=${openaev_dir}" --data-urlencode "serviceName=${openaev_session}" | sh
 
 echo "02. Uninstalling OpenBAS Agent..."
 (

installer/macos/agent-upgrade.sh

@@ -6,6 +6,7 @@ architecture=$(uname -m)
 
 install_dir="${OPENAEV_INSTALL_DIR}"
 service_name="${OPENAEV_SERVICE_NAME}"
+tenant_id="${OPENAEV_TENANT_ID}"
 
 os=$(uname | tr '[:upper:]' '[:lower:]')
 if [ "${os}" = "darwin" ]; then
@@ -26,7 +27,7 @@ if [ -d "$openaev_dir" ]; then
 
 echo "01. Downloading OpenAEV Agent into ${install_dir}..."
 (mkdir -p ${install_dir} && touch ${install_dir} >/dev/null 2>&1) || (echo -n "\nFatal: Can't write to ${install_dir}\n" >&2 && exit 1)
-curl -sSfL ${base_url}/api/agent/executable/openaev/${os}/${architecture} -o ${install_dir}/openaev-agent_upgrade
+curl -sSfL ${base_url}/api/tenants/${tenant_id}/agent/executable/openaev/${os}/${architecture} -o ${install_dir}/openaev-agent_upgrade
 mv ${install_dir}/openaev-agent_upgrade ${install_dir}/openaev-agent
 chmod 755 ${install_dir}/openaev-agent
 
@@ -41,6 +42,7 @@ unsecured_certificate = "${OPENAEV_UNSECURED_CERTIFICATE}"
 with_proxy = "${OPENAEV_WITH_PROXY}"
 installation_mode = "service"
 service_name = "${OPENAEV_SERVICE_NAME}"
+tenant_id = "${OPENAEV_TENANT_ID}"
 EOF
 
 echo "03. Restarting agent service"
@@ -51,7 +53,7 @@ else
 # Uninstall the old named agent *openbas* and install the new named agent *openaev* if the folder openaev doesn't exist
 echo "01. Installing OpenAEV Agent..."
 openaev_service=$(printf %s "${service_name}" | sed 's/openbas/openaev/g')
-curl -sSfLG ${base_url}/api/agent/installer/openaev/${os}/service/${OPENAEV_TOKEN} --data-urlencode "installationDir=${openaev_dir}" --data-urlencode "serviceName=${openaev_service}" | sh
+curl -sSfLG ${base_url}/api/tenants/${tenant_id}/agent/installer/openaev/${os}/service/${OPENAEV_TOKEN} --data-urlencode "installationDir=${openaev_dir}" --data-urlencode "serviceName=${openaev_service}" | sh
 
 echo "02. Uninstalling OpenBAS Agent..."
 (