Skip to content
This repository has been archived by the owner on Apr 20, 2022. It is now read-only.

set “audit” and “auto start” default value #112

Merged
merged 1 commit into from
Nov 5, 2021
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions apiserver/views/agent_register.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ def register_agent(token, version, language, project_name, user,
project_version):
project = IastProject.objects.values('id').filter(name=project_name,
user=user).first()

is_audit = AgentRegisterEndPoint.get_is_audit()
if project:
if project_version:
project_current_version = project_version
Expand All @@ -58,6 +60,7 @@ def register_agent(token, version, language, project_name, user,
project_name=project_name,
project_version_id=project_current_version.id,
language=language,
is_audit=is_audit,
)
else:
agent_id = AgentRegisterEndPoint.get_agent_id(token=token, project_name=project_name, user=user,
Expand All @@ -72,9 +75,14 @@ def register_agent(token, version, language, project_name, user,
project_name=project_name,
project_version_id=0,
language=language,
is_audit=is_audit,
)
return agent_id

@staticmethod
def get_is_audit():
return 1

@staticmethod
def get_command(envs):
for env in envs:
Expand Down Expand Up @@ -272,7 +280,7 @@ def post(self, request: Request):
if agent_id != -1:
IastAgent.objects.filter(pk=agent_id).update(
register_time=int(time.time()))
return R.success(data={'id': agent_id})
return R.success(data={'id': agent_id, 'coreAutoStart': 1})
except Exception as e:
logger.error(e)
return R.failure(msg="探针注册失败,原因:{reason}".format(reason=e))
Expand All @@ -292,7 +300,7 @@ def get_agent_id(token, project_name, user, current_project_version_id):
return -1

@staticmethod
def __register_agent(exist_project, token, user, version, project_id, project_name, project_version_id, language):
def __register_agent(exist_project, token, user, version, project_id, project_name, project_version_id, language, is_audit):
if exist_project:
IastAgent.objects.filter(token=token, online=1, user=user).update(online=0)
agent = IastAgent.objects.create(
Expand All @@ -308,6 +316,7 @@ def __register_agent(exist_project, token, user, version, project_id, project_na
is_core_running=1,
online=1,
project_version_id=project_version_id,
language=language
language=language,
is_audit=is_audit
)
return agent.id