pyrox.dev
1diff --git a/install.sh b/install.sh
2index 387bde1a..cb6dcbf2 100755
3--- a/install.sh
4+++ b/install.sh
5@@ -126,14 +126,14 @@ Install()
6 # Generate the /etc/ossec-init.conf
7 VERSION_FILE="./src/VERSION"
8 VERSION=`cat ${VERSION_FILE}`
9- chmod 700 ${OSSEC_INIT} > /dev/null 2>&1
10- echo "DIRECTORY=\"${INSTALLDIR}\"" > ${OSSEC_INIT}
11- echo "VERSION=\"${VERSION}\"" >> ${OSSEC_INIT}
12- echo "DATE=\"`date`\"" >> ${OSSEC_INIT}
13- echo "TYPE=\"${INSTYPE}\"" >> ${OSSEC_INIT}
14- chmod 600 ${OSSEC_INIT}
15- cp -pr ${OSSEC_INIT} ${INSTALLDIR}${OSSEC_INIT}
16- chmod 640 ${INSTALLDIR}${OSSEC_INIT}
17+ # chmod 700 ${OSSEC_INIT} > /dev/null 2>&1
18+ # echo "DIRECTORY=\"${INSTALLDIR}\"" > ${OSSEC_INIT}
19+ # echo "VERSION=\"${VERSION}\"" >> ${OSSEC_INIT}
20+ # echo "DATE=\"`date`\"" >> ${OSSEC_INIT}
21+ # echo "TYPE=\"${INSTYPE}\"" >> ${OSSEC_INIT}
22+ # chmod 600 ${OSSEC_INIT}
23+ # cp -pr ${OSSEC_INIT} ${INSTALLDIR}${OSSEC_INIT}
24+ # chmod 640 ${INSTALLDIR}${OSSEC_INIT}
25
26
27 # If update_rules is set, we need to tweak
28@@ -148,12 +148,12 @@ Install()
29 fi
30
31 # Calling the init script to start ossec hids during boot
32- if [ "X${update_only}" = "X" ]; then
33- runInit
34- if [ $? = 1 ]; then
35- notmodified="yes"
36- fi
37- fi
38+ # if [ "X${update_only}" = "X" ]; then
39+ # runInit
40+ # if [ $? = 1 ]; then
41+ # notmodified="yes"
42+ # fi
43+ # fi
44
45 }
46
47@@ -965,10 +965,10 @@ main()
48 catError "0x1-location";
49 fi
50
51- # Must be root
52- if [ ! "X$ME" = "Xroot" ]; then
53- catError "0x2-beroot";
54- fi
55+ # # Must be root
56+ # if [ ! "X$ME" = "Xroot" ]; then
57+ # catError "0x2-beroot";
58+ # fi
59
60 # Checking dependencies
61 checkDependencies
62diff --git a/src/Makefile b/src/Makefile
63index 7fc04c0b..0eb27a0a 100644
64--- a/src/Makefile
65+++ b/src/Makefile
66@@ -144,7 +144,7 @@ endif
67 ifeq (${uname_S},AIX)
68 INSTALL_CMD?=./install-shim-aix.ksh -m $(1) -o $(2) -g $(3)
69 else
70- INSTALL_CMD?=install -m $(1) -o $(2) -g $(3)
71+ INSTALL_CMD?=install
72 endif
73
74 ifdef DEBUGAD
75@@ -404,10 +404,10 @@ endif
76 install: install-${TARGET}
77
78 install-agent: install-common
79- $(call INSTALL_CMD,0550,root,0) ossec-agentd ${PREFIX}/bin
80- $(call INSTALL_CMD,0550,root,0) agent-auth ${PREFIX}/bin
81+ $(call INSTALL_CMD) ossec-agentd ${PREFIX}/bin
82+ $(call INSTALL_CMD) agent-auth ${PREFIX}/bin
83
84- $(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/queue/rids
85+ $(call INSTALL_CMD) -d ${PREFIX}/queue/rids
86
87 install-local: install-server-generic
88
89@@ -416,133 +416,126 @@ install-hybrid: install-server-generic
90 install-server: install-server-generic
91
92 install-common: build
93- ./init/adduser.sh ${OSSEC_USER} ${OSSEC_USER_MAIL} ${OSSEC_USER_REM} ${OSSEC_GROUP} ${PREFIX}
94- $(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) -d ${PREFIX}/
95- $(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/logs
96- $(call INSTALL_CMD,0660,${OSSEC_USER},${OSSEC_GROUP}) /dev/null ${PREFIX}/logs/ossec.log
97-
98- $(call INSTALL_CMD,0550,root,0) -d ${PREFIX}/bin
99- $(call INSTALL_CMD,0550,root,0) ossec-logcollector ${PREFIX}/bin
100- $(call INSTALL_CMD,0550,root,0) ossec-syscheckd ${PREFIX}/bin
101- $(call INSTALL_CMD,0550,root,0) ossec-execd ${PREFIX}/bin
102- $(call INSTALL_CMD,0550,root,0) manage_agents ${PREFIX}/bin
103- $(call INSTALL_CMD,0550,root,0) ../contrib/util.sh ${PREFIX}/bin/
104- $(call INSTALL_CMD,0550,root,0) ${OSSEC_CONTROL_SRC} ${PREFIX}/bin/ossec-control
105+ $(call INSTALL_CMD) -d ${PREFIX}/bin
106+ $(call INSTALL_CMD) ossec-logcollector ${PREFIX}/bin
107+ $(call INSTALL_CMD) ossec-syscheckd ${PREFIX}/bin
108+ $(call INSTALL_CMD) ossec-execd ${PREFIX}/bin
109+ $(call INSTALL_CMD) manage_agents ${PREFIX}/bin
110+ $(call INSTALL_CMD) ../contrib/util.sh ${PREFIX}/bin/
111+ $(call INSTALL_CMD) ${OSSEC_CONTROL_SRC} ${PREFIX}/bin/ossec-control
112
113 ifeq (${LUA_ENABLE},yes)
114- $(call INSTALL_CMD,0550,root,0) -d ${PREFIX}/lua
115- $(call INSTALL_CMD,0550,root,0) -d ${PREFIX}/lua/native
116- $(call INSTALL_CMD,0550,root,0) -d ${PREFIX}/lua/compiled
117- $(call INSTALL_CMD,0550,root,0) ${EXTERNAL_LUA}src/ossec-lua ${PREFIX}/bin/
118- $(call INSTALL_CMD,0550,root,0) ${EXTERNAL_LUA}src/ossec-luac ${PREFIX}/bin/
119+ $(call INSTALL_CMD) -d ${PREFIX}/lua
120+ $(call INSTALL_CMD) -d ${PREFIX}/lua/native
121+ $(call INSTALL_CMD) -d ${PREFIX}/lua/compiled
122+ $(call INSTALL_CMD) ${EXTERNAL_LUA}src/ossec-lua ${PREFIX}/bin/
123+ $(call INSTALL_CMD) ${EXTERNAL_LUA}src/ossec-luac ${PREFIX}/bin/
124 endif
125
126- $(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) -d ${PREFIX}/queue
127- $(call INSTALL_CMD,0770,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/queue/alerts
128- $(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/queue/ossec
129- $(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/queue/syscheck
130- $(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/queue/diff
131+ $(call INSTALL_CMD) -d ${PREFIX}/queue
132+ $(call INSTALL_CMD) -d ${PREFIX}/queue/alerts
133+ $(call INSTALL_CMD) -d ${PREFIX}/queue/ossec
134+ $(call INSTALL_CMD) -d ${PREFIX}/queue/syscheck
135+ $(call INSTALL_CMD) -d ${PREFIX}/queue/diff
136
137- $(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) -d ${PREFIX}/etc
138+ $(call INSTALL_CMD) -d ${PREFIX}/etc
139 ifeq (${INSTALL_LOCALTIME},yes)
140- $(call INSTALL_CMD,0440,root,${OSSEC_GROUP}) /etc/localtime ${PREFIX}/etc
141+ $(call INSTALL_CMD) /etc/localtime ${PREFIX}/etc
142 endif
143 ifeq (${INSTALL_RESOLVCONF},yes)
144- $(call INSTALL_CMD,0440,root,${OSSEC_GROUP}) /etc/resolv.conf ${PREFIX}/etc
145+ $(call INSTALL_CMD) /etc/resolv.conf ${PREFIX}/etc
146 endif
147
148- $(call INSTALL_CMD,1550,root,${OSSEC_GROUP}) -d ${PREFIX}/tmp
149+ $(call INSTALL_CMD) -d ${PREFIX}/tmp
150
151 ifneq (,$(wildcard /etc/TIMEZONE))
152- $(call INSTALL_CMD,440,root,${OSSEC_GROUP}) /etc/TIMEZONE ${PREFIX}/etc/
153+ $(call INSTALL_CMD) /etc/TIMEZONE ${PREFIX}/etc/
154 endif
155 # Solaris Needs some extra files
156 ifeq (${uname_S},SunOS)
157- $(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) -d ${PREFIX}/usr/share/lib/zoneinfo/
158+ $(call INSTALL_CMD) -d ${PREFIX}/usr/share/lib/zoneinfo/
159 cp -r /usr/share/lib/zoneinfo/* ${PREFIX}/usr/share/lib/zoneinfo/
160 endif
161- $(call INSTALL_CMD,0640,root,${OSSEC_GROUP}) -b ../etc/internal_options.conf ${PREFIX}/etc/
162+ $(call INSTALL_CMD) -b ../etc/internal_options.conf ${PREFIX}/etc/
163 ifeq (,$(wildcard ${PREFIX}/etc/local_internal_options.conf))
164- $(call INSTALL_CMD,0640,root,${OSSEC_GROUP}) ../etc/local_internal_options.conf ${PREFIX}/etc/local_internal_options.conf
165+ $(call INSTALL_CMD) ../etc/local_internal_options.conf ${PREFIX}/etc/local_internal_options.conf
166 endif
167 ifeq (,$(wildcard ${PREFIX}/etc/client.keys))
168- $(call INSTALL_CMD,0640,root,${OSSEC_GROUP}) /dev/null ${PREFIX}/etc/client.keys
169+ $(call INSTALL_CMD) /dev/null ${PREFIX}/etc/client.keys
170 endif
171 ifeq (,$(wildcard ${PREFIX}/etc/ossec.conf))
172 ifneq (,$(wildcard ../etc/ossec.mc))
173- $(call INSTALL_CMD,0640,root,${OSSEC_GROUP}) ../etc/ossec.mc ${PREFIX}/etc/ossec.conf
174+ $(call INSTALL_CMD) ../etc/ossec.mc ${PREFIX}/etc/ossec.conf
175 else
176- $(call INSTALL_CMD,0640,root,${OSSEC_GROUP}) ${OSSEC_CONF_SRC} ${PREFIX}/etc/ossec.conf
177+ $(call INSTALL_CMD) ${OSSEC_CONF_SRC} ${PREFIX}/etc/ossec.conf
178 endif
179 endif
180
181- $(call INSTALL_CMD,0770,root,${OSSEC_GROUP}) -d ${PREFIX}/etc/shared
182- $(call INSTALL_CMD,0640,${OSSEC_USER},${OSSEC_GROUP}) rootcheck/db/*.txt ${PREFIX}/etc/shared/
183+ $(call INSTALL_CMD) -d ${PREFIX}/etc/shared
184+ $(call INSTALL_CMD) rootcheck/db/*.txt ${PREFIX}/etc/shared/
185
186- $(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) -d ${PREFIX}/active-response
187- $(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) -d ${PREFIX}/active-response/bin
188- $(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) -d ${PREFIX}/agentless
189- $(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) agentlessd/scripts/* ${PREFIX}/agentless/
190+ $(call INSTALL_CMD) -d ${PREFIX}/active-response
191+ $(call INSTALL_CMD) -d ${PREFIX}/active-response/bin
192+ $(call INSTALL_CMD) -d ${PREFIX}/agentless
193+ $(call INSTALL_CMD) agentlessd/scripts/* ${PREFIX}/agentless/
194
195- $(call INSTALL_CMD,0700,root,${OSSEC_GROUP}) -d ${PREFIX}/.ssh
196+ $(call INSTALL_CMD) -d ${PREFIX}/.ssh
197
198- $(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) ../active-response/*.sh ${PREFIX}/active-response/bin/
199- $(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) ../active-response/firewalls/*.sh ${PREFIX}/active-response/bin/
200+ $(call INSTALL_CMD) ../active-response/*.sh ${PREFIX}/active-response/bin/
201+ $(call INSTALL_CMD) ../active-response/firewalls/*.sh ${PREFIX}/active-response/bin/
202
203- $(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) -d ${PREFIX}/var
204- $(call INSTALL_CMD,0770,root,${OSSEC_GROUP}) -d ${PREFIX}/var/run
205-
206- ./init/fw-check.sh execute
207+ $(call INSTALL_CMD) -d ${PREFIX}/var
208+ $(call INSTALL_CMD) -d ${PREFIX}/var/run
209
210
211
212 install-server-generic: install-common
213- $(call INSTALL_CMD,0660,${OSSEC_USER},${OSSEC_GROUP}) /dev/null ${PREFIX}/logs/active-responses.log
214- $(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/logs/archives
215- $(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/logs/alerts
216- $(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/logs/firewall
217-
218- $(call INSTALL_CMD,0550,root,0) ossec-agentlessd ${PREFIX}/bin
219- $(call INSTALL_CMD,0550,root,0) ossec-analysisd ${PREFIX}/bin
220- $(call INSTALL_CMD,0550,root,0) ossec-monitord ${PREFIX}/bin
221- $(call INSTALL_CMD,0550,root,0) ossec-reportd ${PREFIX}/bin
222- $(call INSTALL_CMD,0550,root,0) ossec-maild ${PREFIX}/bin
223- $(call INSTALL_CMD,0550,root,0) ossec-remoted ${PREFIX}/bin
224- $(call INSTALL_CMD,0550,root,0) ossec-logtest ${PREFIX}/bin
225- $(call INSTALL_CMD,0550,root,0) ossec-csyslogd ${PREFIX}/bin
226- $(call INSTALL_CMD,0550,root,0) ossec-authd ${PREFIX}/bin
227- $(call INSTALL_CMD,0550,root,0) ossec-dbd ${PREFIX}/bin
228- $(call INSTALL_CMD,0550,root,0) ossec-makelists ${PREFIX}/bin
229- $(call INSTALL_CMD,0550,root,0) verify-agent-conf ${PREFIX}/bin/
230- $(call INSTALL_CMD,0550,root,0) clear_stats ${PREFIX}/bin/
231- $(call INSTALL_CMD,0550,root,0) list_agents ${PREFIX}/bin/
232- $(call INSTALL_CMD,0550,root,0) ossec-regex ${PREFIX}/bin/
233- $(call INSTALL_CMD,0550,root,0) syscheck_update ${PREFIX}/bin/
234- $(call INSTALL_CMD,0550,root,0) agent_control ${PREFIX}/bin/
235- $(call INSTALL_CMD,0550,root,0) syscheck_control ${PREFIX}/bin/
236- $(call INSTALL_CMD,0550,root,0) rootcheck_control ${PREFIX}/bin/
237-
238- $(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/stats
239- $(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) -d ${PREFIX}/rules
240+ $(call INSTALL_CMD) /dev/null ${PREFIX}/logs/active-responses.log
241+ $(call INSTALL_CMD) -d ${PREFIX}/logs/archives
242+ $(call INSTALL_CMD) -d ${PREFIX}/logs/alerts
243+ $(call INSTALL_CMD) -d ${PREFIX}/logs/firewall
244+
245+ $(call INSTALL_CMD) ossec-agentlessd ${PREFIX}/bin
246+ $(call INSTALL_CMD) ossec-analysisd ${PREFIX}/bin
247+ $(call INSTALL_CMD) ossec-monitord ${PREFIX}/bin
248+ $(call INSTALL_CMD) ossec-reportd ${PREFIX}/bin
249+ $(call INSTALL_CMD) ossec-maild ${PREFIX}/bin
250+ $(call INSTALL_CMD) ossec-remoted ${PREFIX}/bin
251+ $(call INSTALL_CMD) ossec-logtest ${PREFIX}/bin
252+ $(call INSTALL_CMD) ossec-csyslogd ${PREFIX}/bin
253+ $(call INSTALL_CMD) ossec-authd ${PREFIX}/bin
254+ $(call INSTALL_CMD) ossec-dbd ${PREFIX}/bin
255+ $(call INSTALL_CMD) ossec-makelists ${PREFIX}/bin
256+ $(call INSTALL_CMD) verify-agent-conf ${PREFIX}/bin/
257+ $(call INSTALL_CMD) clear_stats ${PREFIX}/bin/
258+ $(call INSTALL_CMD) list_agents ${PREFIX}/bin/
259+ $(call INSTALL_CMD) ossec-regex ${PREFIX}/bin/
260+ $(call INSTALL_CMD) syscheck_update ${PREFIX}/bin/
261+ $(call INSTALL_CMD) agent_control ${PREFIX}/bin/
262+ $(call INSTALL_CMD) syscheck_control ${PREFIX}/bin/
263+ $(call INSTALL_CMD) rootcheck_control ${PREFIX}/bin/
264+
265+ $(call INSTALL_CMD) -d ${PREFIX}/stats
266+ $(call INSTALL_CMD) -d ${PREFIX}/rules
267 ifneq (,$(wildcard ${PREFIX}/rules/local_rules.xml))
268 cp ${PREFIX}/rules/local_rules.xml ${PREFIX}/rules/local_rules.xml.installbackup
269- $(call INSTALL_CMD,0640,root,${OSSEC_GROUP}) -b ../etc/rules/*.xml ${PREFIX}/rules
270- $(call INSTALL_CMD,0640,root,${OSSEC_GROUP}) ${PREFIX}/rules/local_rules.xml.installbackup ${PREFIX}/rules/local_rules.xml
271+ $(call INSTALL_CMD) -b ../etc/rules/*.xml ${PREFIX}/rules
272+ $(call INSTALL_CMD) ${PREFIX}/rules/local_rules.xml.installbackup ${PREFIX}/rules/local_rules.xml
273 rm ${PREFIX}/rules/local_rules.xml.installbackup
274 else
275- $(call INSTALL_CMD,0640,root,${OSSEC_GROUP}) -b ../etc/rules/*.xml ${PREFIX}/rules
276+ $(call INSTALL_CMD) -b ../etc/rules/*.xml ${PREFIX}/rules
277 endif
278
279- $(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/queue/fts
280+ $(call INSTALL_CMD) -d ${PREFIX}/queue/fts
281
282- $(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/queue/rootcheck
283+ $(call INSTALL_CMD) -d ${PREFIX}/queue/rootcheck
284
285- $(call INSTALL_CMD,0750,${OSSEC_USER_REM},${OSSEC_GROUP}) -d ${PREFIX}/queue/agent-info
286- $(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/queue/agentless
287+ $(call INSTALL_CMD) -d ${PREFIX}/queue/agent-info
288+ $(call INSTALL_CMD) -d ${PREFIX}/queue/agentless
289
290- $(call INSTALL_CMD,0750,${OSSEC_USER_REM},${OSSEC_GROUP}) -d ${PREFIX}/queue/rids
291+ $(call INSTALL_CMD) -d ${PREFIX}/queue/rids
292
293- $(call INSTALL_CMD,0640,root,${OSSEC_GROUP}) ../etc/decoder.xml ${PREFIX}/etc/
294+ $(call INSTALL_CMD) ../etc/decoder.xml ${PREFIX}/etc/
295
296 rm -f ${PREFIX}/etc/shared/merged.mg
297