Attachment #226082 for bug #256545

View | Details | Raw Unified | Return to bug 256545
Collapse All | Expand All

Lines 1-3 Link Here

(-)b/security/ossec-hids-local-config/Makefile (+1 lines)
		1	PORTREVISION?= 2
1	PKGNAMESUFFIX?= -${OSSEC_TYPE}-config	2	PKGNAMESUFFIX?= -${OSSEC_TYPE}-config
2	COMMENT?= Configuration manager for ossec-hids-${OSSEC_TYPE}	3	COMMENT?= Configuration manager for ossec-hids-${OSSEC_TYPE}
3	OSSEC_TYPE?= local	4	OSSEC_TYPE?= local

Lines 8-14 agent_conf_files="${agent_conf_dir}/*.conf" Link Here

(-)b/security/ossec-hids-local-config/files/agent-conf.in (-2 / +2 lines)
8		8
9	select_elements() {	9	select_elements() {
10	local element="$1"	10	local element="$1"
11	sed -n "/<${element}.*>/,/<\/${element}>/p"	11	sed -En "/<${element}.*>/,/<\/${element}>/p"
12	}	12	}
13		13
14	remove_comments() {	14	remove_comments() {
Lines 17-23 remove_comments() { Link Here
17	}	17	}
18		18
19	remove_empty_lines() {	19	remove_empty_lines() {
20	sed '/^\s*$/d'	20	sed -E '/^[[:space:]]*$/d'
21	}	21	}
22		22
23	agent_conf() {	23	agent_conf() {





select_elements_content() {
    local element="$1"
    sed -En "/<${element}>/,/<\/${element}>/{ /<${element}>/d; /<\/${element}>/d; p; }"
}

remove_elements() {
    local element="$1"
    sed -E "/<${element}>/,/<\/${element}>/d"
}

remove_comments() {

}

remove_empty_lines() {
    sed -E '/^[[:space:]]*$/d'
}

ossec_conf() {

Lines 61-70 while read line; do Link Here

(-)b/security/ossec-hids-local-config/scripts/plist.sh (-2 / +2 lines)
61	path=""	61	path=""
62	case ${line} in	62	case ${line} in
63	"@dir %%OSSEC_HOME%%"*)	63	"@dir %%OSSEC_HOME%%"*)
64	path=`echo "${line}" \| sed -e "s\|@dir %%OSSEC_HOME%%\|\|g"`	64	path=`echo "${line}" \| sed -E 's\|@dir %%OSSEC_HOME%%\|\|g'`
65	;;	65	;;
66	"%%OSSEC_HOME%%"*)	66	"%%OSSEC_HOME%%"*)
67	path=`echo "${line}" \| sed -e "s\|%%OSSEC_HOME%%\|\|g"`	67	path=`echo "${line}" \| sed -E 's\|%%OSSEC_HOME%%\|\|g'`
68	;;	68	;;
69	"%%"*)	69	"%%"*)
70	unchanged_lines="${unchanged_lines}${NL}${line}"	70	unchanged_lines="${unchanged_lines}${NL}${line}"

Lines 19-25 ossec_syscheck_bin_dirs="${ossec_prefix}/bin,${ossec_prefix}/active-response" Link Here

(-)b/security/ossec-hids-local-config/scripts/template-to-agent.sh (-2 / +3 lines)
19	ossec_syscheck_etc_dirs="${ossec_prefix}/etc"	19	ossec_syscheck_etc_dirs="${ossec_prefix}/etc"
20		20
21	replace() {	21	replace() {
22	sed -e 's\|<template_config $.*$>\|<agent_config \1>\|' \	22	sed -E \
		23	-e 's\|<template_config (.*)>\|<agent_config \1>\|' \
23	-e 's\|</template_config>\|</agent_config>\|' \	24	-e 's\|</template_config>\|</agent_config>\|' \
24	-e "s\|%%OSSEC_SYSCHECK_BIN_DIRS%%\|${ossec_syscheck_bin_dirs}\|" \	25	-e "s\|%%OSSEC_SYSCHECK_BIN_DIRS%%\|${ossec_syscheck_bin_dirs}\|" \
25	-e "s\|%%OSSEC_SYSCHECK_ETC_DIRS%%\|${ossec_syscheck_etc_dirs}\|" \	26	-e "s\|%%OSSEC_SYSCHECK_ETC_DIRS%%\|${ossec_syscheck_etc_dirs}\|" \
Lines 27-33 replace() { Link Here
27	}	28	}
28		29
29	extract() {	30	extract() {
30	sed -n '/^<agent_config .*>$/,/^<\/agent_config>$/p'	31	sed -En '/^<agent_config .*>$/,/^<\/agent_config>$/p'
31	}	32	}
32		33
33	replace \| extract	34	replace \| extract





replace() {
    if grep -q "<template_config>" "${ossec_file}"; then
        sed -E \
            -e 's|<template_config>|<ossec_config>|' \
            -e 's|</template_config>|</ossec_config>|' \
            -e "s|%%OSSEC_SYSCHECK_BIN_DIRS%%|${ossec_syscheck_bin_dirs}|" \
            -e "s|%%OSSEC_SYSCHECK_ETC_DIRS%%|${ossec_syscheck_etc_dirs}|" \
            "${ossec_file}"
    else
        sed -E \
            -e 's|<template_config .*os="FreeBSD".*>|<ossec_config>|' \
            -e 's|</template_config>|</ossec_config>|' \
            -e "s|%%OSSEC_SYSCHECK_BIN_DIRS%%|${ossec_syscheck_bin_dirs}|" \
            -e "s|%%OSSEC_SYSCHECK_ETC_DIRS%%|${ossec_syscheck_etc_dirs}|" \

}

extract() {
    sed -En '/^<ossec_config.*>$/,/^<\/ossec_config>$/p'
}

replace | extract

Lines 486-492 ossec_hids_fetch_config() { Link Here

(-)b/security/ossec-hids-local/files/ossec-hids.in (-1 / +1 lines)
486	echo "${ossec_rc_path} reset_counter"	486	echo "${ossec_rc_path} reset_counter"
487	echo "${ossec_rc_path} fetch_config"	487	echo "${ossec_rc_path} fetch_config"
488	echo	488	echo
489	echo "If this does't help, you need to reset counter on the server."	489	echo "If this doesn't help, you need to reset counter on the server."
490	echo "If the server runs FreeBSD port of OSSEC, run:"	490	echo "If the server runs FreeBSD port of OSSEC, run:"
491	echo "On the agent:"	491	echo "On the agent:"
492	echo "${ossec_rc_path} reset_counter"	492	echo "${ossec_rc_path} reset_counter"

Lines 61-70 while read line; do Link Here

(-)b/security/ossec-hids-local/scripts/plist.sh (-2 / +2 lines)
61	path=""	61	path=""
62	case ${line} in	62	case ${line} in
63	"@dir %%OSSEC_HOME%%"*)	63	"@dir %%OSSEC_HOME%%"*)
64	path=`echo "${line}" \| sed -e "s\|@dir %%OSSEC_HOME%%\|\|g"`	64	path=`echo "${line}" \| sed -E 's\|@dir %%OSSEC_HOME%%\|\|g'`
65	;;	65	;;
66	"%%OSSEC_HOME%%"*)	66	"%%OSSEC_HOME%%"*)
67	path=`echo "${line}" \| sed -e "s\|%%OSSEC_HOME%%\|\|g"`	67	path=`echo "${line}" \| sed -E 's\|%%OSSEC_HOME%%\|\|g'`
68	;;	68	;;
69	"%%"*)	69	"%%"*)
70	unchanged_lines="${unchanged_lines}${NL}${line}"	70	unchanged_lines="${unchanged_lines}${NL}${line}"

Return to bug 256545

Lines 8-19 ossec_conf_files="${ossec_conf_dir}/*.conf" Link Here

(-)b/security/ossec-hids-local-config/files/ossec-conf.in (-3 / +3 lines)
8		8
9	select_elements_content() {	9	select_elements_content() {
10	local element="$1"	10	local element="$1"
11	sed -n "/<${element}>/,/<\/${element}>/{ /<${element}>/d; /<\/${element}>/d; p; }"	11	sed -En "/<${element}>/,/<\/${element}>/{ /<${element}>/d; /<\/${element}>/d; p; }"
12	}	12	}
13		13
14	remove_elements() {	14	remove_elements() {
15	local element="$1"	15	local element="$1"
16	sed -e "/<${element}>/,/<\/${element}>/d"	16	sed -E "/<${element}>/,/<\/${element}>/d"
17	}	17	}
18		18
19	remove_comments() {	19	remove_comments() {
Lines 22-28 remove_comments() { Link Here
22	}	22	}
23		23
24	remove_empty_lines() {	24	remove_empty_lines() {
25	sed '/^\s*$/d'	25	sed -E '/^[[:space:]]*$/d'
26	}	26	}
27		27
28	ossec_conf() {	28	ossec_conf() {