Skip to content

Commit 23dae61

Browse files
GeoffMonteeLinuxJedi
authored andcommitted
MDEV-18374: Add SELinux policy to cracklib_password_check packages
1 parent 515ba85 commit 23dae61

File tree

4 files changed

+48
-0
lines changed

4 files changed

+48
-0
lines changed

cmake/cpack_rpm.cmake

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,8 @@ SET(CPACK_RPM_shared_POST_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/support-files/
229229
SET(CPACK_RPM_shared_POST_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/support-files/rpm/shared-post.sh)
230230
SET(CPACK_RPM_compat_POST_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/support-files/rpm/shared-post.sh)
231231
SET(CPACK_RPM_compat_POST_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/support-files/rpm/shared-post.sh)
232+
SET(CPACK_RPM_cracklib-password-check_POST_INSTALL_SCRIPT_FILE
233+
${CMAKE_SOURCE_DIR}/plugin/cracklib_password_check/support-files/rpm/mariadb-plugin-cracklib-password-check-postin.sh)
232234

233235
MACRO(ALTERNATIVE_NAME real alt)
234236
IF(${ARGC} GREATER 2)

plugin/cracklib_password_check/CMakeLists.txt

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,29 @@ IF (HAVE_ALLOCA_H AND HAVE_CRACK_H AND HAVE_LIBCRACK AND HAVE_MEMCPY)
1414
MYSQL_ADD_PLUGIN(cracklib_password_check cracklib_password_check.c
1515
LINK_LIBRARIES crack MODULE_ONLY
1616
COMPONENT cracklib-password-check)
17+
18+
IF (RPM)
19+
SET(inst_location ${INSTALL_SUPPORTFILESDIR})
20+
INSTALL(DIRECTORY policy DESTINATION ${inst_location} COMPONENT cracklib-password-check)
21+
FIND_PROGRAM(CHECKMODULE checkmodule)
22+
FIND_PROGRAM(SEMODULE_PACKAGE semodule_package)
23+
MARK_AS_ADVANCED(CHECKMODULE SEMODULE_PACKAGE)
24+
25+
# Build pp files in policy/selinux
26+
IF(CHECKMODULE AND SEMODULE_PACKAGE)
27+
FOREACH(pol mariadb-plugin-cracklib-password-check)
28+
SET(src ${CMAKE_CURRENT_SOURCE_DIR}/policy/selinux/${pol}.te)
29+
SET(tmp ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${pol}-pp.dir/${pol}.mod)
30+
SET(out ${CMAKE_CURRENT_BINARY_DIR}/${pol}.pp)
31+
ADD_CUSTOM_COMMAND(OUTPUT ${out}
32+
COMMAND ${CHECKMODULE} -M -m ${src} -o ${tmp}
33+
COMMAND ${SEMODULE_PACKAGE} -m ${tmp} -o ${out}
34+
DEPENDS ${src})
35+
ADD_CUSTOM_TARGET(${pol}-pp ALL DEPENDS ${out})
36+
INSTALL(FILES ${out} DESTINATION ${inst_location}/policy/selinux COMPONENT cracklib-password-check)
37+
ENDFOREACH()
38+
ENDIF()
39+
40+
ENDIF()
41+
1742
ENDIF()
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
2+
module mariadb-plugin-cracklib-password-check 1.0;
3+
4+
require {
5+
type mysqld_t;
6+
type crack_db_t;
7+
class file { execute setattr read create getattr execute_no_trans write ioctl open append unlink };
8+
class dir { write search getattr add_name read remove_name open };
9+
}
10+
11+
allow mysqld_t crack_db_t:dir { search read open };
12+
allow mysqld_t crack_db_t:file { getattr read open };
13+
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
SETARGETDIR=/etc/selinux/targeted/src/policy
2+
SEDOMPROG=$SETARGETDIR/domains/program
3+
SECONPROG=$SETARGETDIR/file_contexts/program
4+
5+
if [ -x /usr/sbin/semodule ] ; then
6+
/usr/sbin/semodule -i /usr/share/mysql/policy/selinux/mariadb-plugin-cracklib-password-check.pp
7+
fi
8+

0 commit comments

Comments
 (0)