tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-04-08 17:05:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix commonName check in the auto-discovery script.

Browse Source 
Refs #4865
This commit is contained in:
Gunnar Beutner 2014-04-12 22:46:56 +02:00
parent 0ea144a64d
commit 02c7207d9a
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/icinga2-common.install vendored
View File

@ -2,7 +2,7 @@ debian/tmp/etc/icinga2
usr/bin/icinga2-build* usr/bin/icinga2-build*
usr/bin/icinga2-sign-key usr/bin/icinga2-sign-key
usr/bin/icinga2-migrate-config usr/bin/icinga2-migrate-config
usr/bin/icinga2-discover-agent
usr/sbin/icinga2-*-feature usr/sbin/icinga2-*-feature
usr/sbin/icinga2-setup-agent usr/sbin/icinga2-setup-agent
usr/sbin/icinga2-discover-agent
usr/share/icinga2 usr/share/icinga2

4
tools/CMakeLists.txt
View File

@ -23,7 +23,7 @@ if(UNIX OR CYGWIN)
configure_file(icinga2-discover-agent.cmake ${CMAKE_CURRENT_BINARY_DIR}/icinga2-discover-agent @ONLY) configure_file(icinga2-discover-agent.cmake ${CMAKE_CURRENT_BINARY_DIR}/icinga2-discover-agent @ONLY)
install( install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/icinga2-enable-feature FILES ${CMAKE_CURRENT_BINARY_DIR}/icinga2-enable-feature ${CMAKE_CURRENT_BINARY_DIR}/icinga2-discover-agent
DESTINATION ${CMAKE_INSTALL_SBINDIR} DESTINATION ${CMAKE_INSTALL_SBINDIR}
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
) )
@ -31,7 +31,7 @@ if(UNIX OR CYGWIN)
install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink ./icinga2-enable-feature \"\$ENV{DESTDIR}${CMAKE_INSTALL_FULL_SBINDIR}/icinga2-disable-feature\")") install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink ./icinga2-enable-feature \"\$ENV{DESTDIR}${CMAKE_INSTALL_FULL_SBINDIR}/icinga2-disable-feature\")")
install( install(
FILES ${CMAKE_CURRENT_SOURCE_DIR}/migration/icinga2-migrate-config ${CMAKE_CURRENT_BINARY_DIR}/icinga2-discover-agent FILES ${CMAKE_CURRENT_SOURCE_DIR}/migration/icinga2-migrate-config
DESTINATION ${CMAKE_INSTALL_BINDIR} DESTINATION ${CMAKE_INSTALL_BINDIR}
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
) )

7
tools/icinga2-discover-agent.cmake
View File

@ -144,12 +144,15 @@ ssl_sock.connect((host, port))
cn = None cn = None
for rdn in ssl_sock.getpeercert()["subject"][0]: subject = ssl_sock.getpeercert()["subject"]
for prdn in subject:
rdn = prdn[0]
if rdn[0] == "commonName": if rdn[0] == "commonName":
cn = rdn[1] cn = rdn[1]
if cn == None: if cn == None:
warning("Agent certificate does not have a commonName.") warning("Agent certificate does not have a commonName:", repr(subject))
sys.exit(1) sys.exit(1)
ssl_sock.write('20:{"method":"get_crs"},') ssl_sock.write('20:{"method":"get_crs"},')