Re: svn commit: r302897 - head/usr.sbin/bsdinstall/scripts

2016-07-18 Thread Nathan Whitehorn



On 07/15/16 08:07, Bartek Rutkowski wrote:

Author: robak (ports committer)
Date: Fri Jul 15 15:07:24 2016
New Revision: 302897
URL: https://svnweb.freebsd.org/changeset/base/302897

Log:
   Add new System Hardening menu and options to bsdinstall.
   
   This patch add new 'hardening' file responsible for new bsdinstall

   'System Hardening' menu allowing users to set some sane and carefully
   picked system security options (like random process id's, hiding
   other users/groups processes and others).
   
   All options are OFF by default in this patch due to POLA principle

   with intention to turn change some of them to ON by default in future.
   
   Reviewed by:	adrian, allanjude, bdrewery, nwhitehorn

   Approved by: adrian, allanjude
   MFC after:   7 days


Thanks for this! One nit below.

Modified: head/usr.sbin/bsdinstall/scripts/auto
==
--- head/usr.sbin/bsdinstall/scripts/auto   Fri Jul 15 13:25:47 2016
(r302896)
+++ head/usr.sbin/bsdinstall/scripts/auto   Fri Jul 15 15:07:24 2016
(r302897)
@@ -385,6 +385,7 @@ if [ "$NETCONFIG_DONE" != yes ]; then
  fi
  bsdinstall time
  bsdinstall services
+bsdinstall hardening


As discussed in the review, I'd prefer it if this were not here and only 
the part below (in the final menu) were present in the auto script, in 
particular for 11.0-RELEASE. This keeps the installer flow and avoids 
preventing the user with a new menu of optional off-by-default things 
that you have to get through to finish the installation (Handbook 
installation is in the same category). Would it be possible to change that?

-Nathan


  dialog --backtitle "FreeBSD Installer" --title "Add User Accounts" --yesno \
  "Would you like to add users to the installed system now?" 0 0 && \
@@ -401,6 +402,7 @@ finalconfig() {
"Hostname" "Set system hostname" \
"Network" "Networking configuration" \
"Services" "Set daemons to run on startup" \
+   "System Hardening" "Set security options" \
"Time Zone" "Set system timezone" \
"Handbook" "Install FreeBSD Handbook (requires network)" 2>&1 
1>&3)
exec 3>&-
@@ -426,6 +428,10 @@ finalconfig() {
bsdinstall services
finalconfig
;;
+   "System Hardening")
+   bsdinstall hardening
+   finalconfig
+   ;;
"Time Zone")
bsdinstall time
finalconfig



___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"


svn commit: r302897 - head/usr.sbin/bsdinstall/scripts

2016-07-15 Thread Bartek Rutkowski
Author: robak (ports committer)
Date: Fri Jul 15 15:07:24 2016
New Revision: 302897
URL: https://svnweb.freebsd.org/changeset/base/302897

Log:
  Add new System Hardening menu and options to bsdinstall.
  
  This patch add new 'hardening' file responsible for new bsdinstall
  'System Hardening' menu allowing users to set some sane and carefully
  picked system security options (like random process id's, hiding
  other users/groups processes and others).
  
  All options are OFF by default in this patch due to POLA principle
  with intention to turn change some of them to ON by default in future.
  
  Reviewed by:  adrian, allanjude, bdrewery, nwhitehorn
  Approved by:  adrian, allanjude
  MFC after:7 days

Added:
  head/usr.sbin/bsdinstall/scripts/hardening   (contents, props changed)
Modified:
  head/usr.sbin/bsdinstall/scripts/Makefile
  head/usr.sbin/bsdinstall/scripts/auto
  head/usr.sbin/bsdinstall/scripts/config

Modified: head/usr.sbin/bsdinstall/scripts/Makefile
==
--- head/usr.sbin/bsdinstall/scripts/Makefile   Fri Jul 15 13:25:47 2016
(r302896)
+++ head/usr.sbin/bsdinstall/scripts/Makefile   Fri Jul 15 15:07:24 2016
(r302897)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-SCRIPTS= auto adduser checksum config docsinstall entropy hostname jail \
+SCRIPTS= auto adduser checksum config docsinstall entropy hardening hostname 
jail \
 keymap mirrorselect mount netconfig netconfig_ipv4 netconfig_ipv6 \
 rootpass script services time umount wlanconfig zfsboot
 BINDIR= ${LIBEXECDIR}/bsdinstall

Modified: head/usr.sbin/bsdinstall/scripts/auto
==
--- head/usr.sbin/bsdinstall/scripts/auto   Fri Jul 15 13:25:47 2016
(r302896)
+++ head/usr.sbin/bsdinstall/scripts/auto   Fri Jul 15 15:07:24 2016
(r302897)
@@ -385,6 +385,7 @@ if [ "$NETCONFIG_DONE" != yes ]; then
 fi
 bsdinstall time
 bsdinstall services
+bsdinstall hardening
 
 dialog --backtitle "FreeBSD Installer" --title "Add User Accounts" --yesno \
 "Would you like to add users to the installed system now?" 0 0 && \
@@ -401,6 +402,7 @@ finalconfig() {
"Hostname" "Set system hostname" \
"Network" "Networking configuration" \
"Services" "Set daemons to run on startup" \
+   "System Hardening" "Set security options" \
"Time Zone" "Set system timezone" \
"Handbook" "Install FreeBSD Handbook (requires network)" 2>&1 
1>&3)
exec 3>&-
@@ -426,6 +428,10 @@ finalconfig() {
bsdinstall services
finalconfig
;;
+   "System Hardening")
+   bsdinstall hardening
+   finalconfig
+   ;;
"Time Zone")
bsdinstall time
finalconfig

Modified: head/usr.sbin/bsdinstall/scripts/config
==
--- head/usr.sbin/bsdinstall/scripts/config Fri Jul 15 13:25:47 2016
(r302896)
+++ head/usr.sbin/bsdinstall/scripts/config Fri Jul 15 15:07:24 2016
(r302897)
@@ -32,6 +32,9 @@
 cat $BSDINSTALL_TMPETC/rc.conf.* >> $BSDINSTALL_TMPETC/rc.conf
 rm $BSDINSTALL_TMPETC/rc.conf.*
 
+cat $BSDINSTALL_CHROOT/etc/sysctl.conf 
$BSDINSTALL_TMPETC/sysctl.conf.hardening >> $BSDINSTALL_TMPETC/sysctl.conf
+rm $BSDINSTALL_TMPETC/sysctl.conf.*
+
 cp $BSDINSTALL_TMPETC/* $BSDINSTALL_CHROOT/etc
 
 cat $BSDINSTALL_TMPBOOT/loader.conf.* >> $BSDINSTALL_TMPBOOT/loader.conf

Added: head/usr.sbin/bsdinstall/scripts/hardening
==
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ head/usr.sbin/bsdinstall/scripts/hardening  Fri Jul 15 15:07:24 2016
(r302897)
@@ -0,0 +1,79 @@
+#!/bin/sh
+#-
+# Copyright (c) 2016 Bartek Rutkowski
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#notice, this list of conditions and the following disclaimer in the
+#documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+#