[PATCH 1/2] sysprep: remove ca certificates in the guest
Remove the ca certificates. Signed-off-by: Wanlong Gao <gaowanlong@cn.fujitsu.com> --- sysprep/Makefile.am | 2 + sysprep/sysprep_operation_ca_certificates.ml | 62 ++++++++++++++++++++++++++ 2 files changed, 64 insertions(+) create mode 100644 sysprep/sysprep_operation_ca_certificates.ml diff --git a/sysprep/Makefile.am b/sysprep/Makefile.am index d82e5ae..c6292cc 100644 --- a/sysprep/Makefile.am +++ b/sysprep/Makefile.am @@ -35,6 +35,7 @@ SOURCES = \ sysprep_operation.ml \ sysprep_operation.mli \ sysprep_operation_bash_history.ml \ + sysprep_operation_ca_certificates.ml \ sysprep_operation_cron_spool.ml \ sysprep_operation_dhcp_client_state.ml \ sysprep_operation_dhcp_server_state.ml \ @@ -68,6 +69,7 @@ OBJECTS = \ utils.cmx \ sysprep_operation.cmx \ sysprep_operation_bash_history.cmx \ + sysprep_operation_ca_certificates.cmx \ sysprep_operation_cron_spool.cmx \ sysprep_operation_dhcp_client_state.cmx \ sysprep_operation_dhcp_server_state.cmx \ diff --git a/sysprep/sysprep_operation_ca_certificates.ml b/sysprep/sysprep_operation_ca_certificates.ml new file mode 100644 index 0000000..82b4189 --- /dev/null +++ b/sysprep/sysprep_operation_ca_certificates.ml @@ -0,0 +1,62 @@ +(* virt-sysprep + * Copyright (C) 2012 FUJITSU LIMITED + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + *) + +open Sysprep_operation +open Sysprep_gettext.Gettext + +module G = Guestfs + +let ca_certificates_perform g root = + let typ = g#inspect_get_type root in + if typ <> "windows" then ( + let paths = [ "/etc/pki/CA/certs/*"; + "/etc/pki/CA/crl/*"; + "/etc/pki/CA/newcerts/*"; + "/etc/pki/CA/private/*"; + "/etc/pki/tls/private/*"; + "/etc/pki/tls/certs/*.crt"; ] in + let excepts = [ "/etc/pki/tls/certs/ca-bundle.crt"; + "/etc/pki/tls/certs/ca-bundle.trust.crt"; ] in + List.iter ( + fun path -> + let files = g#glob_expand path in + Array.iter ( + fun file -> + List.iter ( + fun except -> + if file <> except then ( + try g#rm file with G.Error _ -> () + ) + ) excepts; + ) files; + ) paths; + + [] + ) + else [] + +let ca_certificates_op = { + name = "ca-certificates"; + enabled_by_default = true; + heading = s_"Remove CA certificates in the guest"; + pod_description = None; + extra_args = []; + perform = ca_certificates_perform; +} + +let () = register_operation ca_certificates_op -- 1.7.10
Remove blkid tab cache in the guest. Signed-off-by: Wanlong Gao <gaowanlong@cn.fujitsu.com> --- sysprep/Makefile.am | 2 ++ sysprep/sysprep_operation_blkid_tab.ml | 46 ++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 sysprep/sysprep_operation_blkid_tab.ml diff --git a/sysprep/Makefile.am b/sysprep/Makefile.am index c6292cc..4f14400 100644 --- a/sysprep/Makefile.am +++ b/sysprep/Makefile.am @@ -35,6 +35,7 @@ SOURCES = \ sysprep_operation.ml \ sysprep_operation.mli \ sysprep_operation_bash_history.ml \ + sysprep_operation_blkid_tab.ml \ sysprep_operation_ca_certificates.ml \ sysprep_operation_cron_spool.ml \ sysprep_operation_dhcp_client_state.ml \ @@ -69,6 +70,7 @@ OBJECTS = \ utils.cmx \ sysprep_operation.cmx \ sysprep_operation_bash_history.cmx \ + sysprep_operation_blkid_tab.cmx \ sysprep_operation_ca_certificates.cmx \ sysprep_operation_cron_spool.cmx \ sysprep_operation_dhcp_client_state.cmx \ diff --git a/sysprep/sysprep_operation_blkid_tab.ml b/sysprep/sysprep_operation_blkid_tab.ml new file mode 100644 index 0000000..6a5ec9a --- /dev/null +++ b/sysprep/sysprep_operation_blkid_tab.ml @@ -0,0 +1,46 @@ +(* virt-sysprep + * Copyright (C) 2012 FUJITSU LIMITED + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + *) + +open Sysprep_operation +open Sysprep_gettext.Gettext + +module G = Guestfs + +let blkid_tab_perform g root = + let typ = g#inspect_get_type root in + if typ <> "windows" then ( + let files = g#glob_expand "/etc/blkid/*tab*" in + Array.iter ( + fun file -> + try g#rm file with G.Error _ -> () + ) files; + + [] + ) + else [] + +let blkid_tab_op = { + name = "blkid-tab"; + enabled_by_default = true; + heading = s_"Remove blkid tab in the guest"; + pod_description = None; + extra_args = []; + perform = blkid_tab_perform; +} + +let () = register_operation blkid_tab_op -- 1.7.10
On Wed, May 09, 2012 at 06:08:55PM +0800, Wanlong Gao wrote:
+ let files = g#glob_expand "/etc/blkid/*tab*" in
Good idea in principle, but you have to delete the file in a few more places: /var/run/blkid.tab /etc/blkid/blkid.tab /etc/blkid.tab # older debian /dev/.blkid.tab # newer debian AND! ... you have to check that the file you're going to remove isn't a symbolic link. Because at least on some versions of debian, /etc/blkid.tab is a symlink, and you *don't* want to remove it. There is a g#is_symlink function for checking if a path is a symlink: http://libguestfs.org/guestfs.3.html#guestfs_is_symlink Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming blog: http://rwmj.wordpress.com Fedora now supports 80 OCaml packages (the OPEN alternative to F#) http://cocan.org/getting_started_with_ocaml_on_red_hat_and_fedora
On 05/09/2012 07:49 PM, Richard W.M. Jones wrote:
On Wed, May 09, 2012 at 06:08:55PM +0800, Wanlong Gao wrote:
+ let files = g#glob_expand "/etc/blkid/*tab*" in
Good idea in principle, but you have to delete the file in a few more places:
/var/run/blkid.tab /etc/blkid/blkid.tab /etc/blkid.tab # older debian /dev/.blkid.tab # newer debian
AND! ... you have to check that the file you're going to remove isn't a symbolic link. Because at least on some versions of debian, /etc/blkid.tab is a symlink, and you *don't* want to remove it.
There is a g#is_symlink function for checking if a path is a symlink:
Yeah, I see, thank you, I'll update the patch tomorrow. Wanlong Gao
Rich.
Remove blkid tab cache in the guest. Signed-off-by: Wanlong Gao <gaowanlong@cn.fujitsu.com> --- sysprep/Makefile.am | 2 ++ sysprep/sysprep_operation_blkid_tab.ml | 55 ++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+) create mode 100644 sysprep/sysprep_operation_blkid_tab.ml diff --git a/sysprep/Makefile.am b/sysprep/Makefile.am index d82e5ae..ff67f66 100644 --- a/sysprep/Makefile.am +++ b/sysprep/Makefile.am @@ -35,6 +35,7 @@ SOURCES = \ sysprep_operation.ml \ sysprep_operation.mli \ sysprep_operation_bash_history.ml \ + sysprep_operation_blkid_tab.ml \ sysprep_operation_cron_spool.ml \ sysprep_operation_dhcp_client_state.ml \ sysprep_operation_dhcp_server_state.ml \ @@ -68,6 +69,7 @@ OBJECTS = \ utils.cmx \ sysprep_operation.cmx \ sysprep_operation_bash_history.cmx \ + sysprep_operation_blkid_tab.cmx \ sysprep_operation_cron_spool.cmx \ sysprep_operation_dhcp_client_state.cmx \ sysprep_operation_dhcp_server_state.cmx \ diff --git a/sysprep/sysprep_operation_blkid_tab.ml b/sysprep/sysprep_operation_blkid_tab.ml new file mode 100644 index 0000000..30bd9a7 --- /dev/null +++ b/sysprep/sysprep_operation_blkid_tab.ml @@ -0,0 +1,55 @@ +(* virt-sysprep + * Copyright (C) 2012 FUJITSU LIMITED + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + *) + +open Sysprep_operation +open Sysprep_gettext.Gettext + +module G = Guestfs + +let blkid_tab_perform g root = + let typ = g#inspect_get_type root in + if typ <> "windows" then ( + let files = [ "/var/run/blkid.tab"; + "/var/run/blkid.tab.old"; + "/etc/blkid/blkid.tab"; + "/etc/blkid/blkid.tab.old"; + "/etc/blkid.tab"; + "/etc/blkid.tab.old"; + "/dev/.blkid.tab"; + "/dev/.blkid.tab.old"; ] in + List.iter ( + fun file -> + if not (g#is_symlink file) then ( + try g#rm file with G.Error _ -> () + ) + ) files; + + [] + ) + else [] + +let blkid_tab_op = { + name = "blkid-tab"; + enabled_by_default = true; + heading = s_"Remove blkid tab in the guest"; + pod_description = None; + extra_args = []; + perform = blkid_tab_perform; +} + +let () = register_operation blkid_tab_op -- 1.7.10
On Thu, May 10, 2012 at 11:18:22PM +0800, Wanlong Gao wrote:
Remove blkid tab cache in the guest.
Signed-off-by: Wanlong Gao <gaowanlong@cn.fujitsu.com> --- sysprep/Makefile.am | 2 ++ sysprep/sysprep_operation_blkid_tab.ml | 55 ++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+) create mode 100644 sysprep/sysprep_operation_blkid_tab.ml
diff --git a/sysprep/Makefile.am b/sysprep/Makefile.am index d82e5ae..ff67f66 100644 --- a/sysprep/Makefile.am +++ b/sysprep/Makefile.am @@ -35,6 +35,7 @@ SOURCES = \ sysprep_operation.ml \ sysprep_operation.mli \ sysprep_operation_bash_history.ml \ + sysprep_operation_blkid_tab.ml \ sysprep_operation_cron_spool.ml \ sysprep_operation_dhcp_client_state.ml \ sysprep_operation_dhcp_server_state.ml \ @@ -68,6 +69,7 @@ OBJECTS = \ utils.cmx \ sysprep_operation.cmx \ sysprep_operation_bash_history.cmx \ + sysprep_operation_blkid_tab.cmx \ sysprep_operation_cron_spool.cmx \ sysprep_operation_dhcp_client_state.cmx \ sysprep_operation_dhcp_server_state.cmx \ diff --git a/sysprep/sysprep_operation_blkid_tab.ml b/sysprep/sysprep_operation_blkid_tab.ml new file mode 100644 index 0000000..30bd9a7 --- /dev/null +++ b/sysprep/sysprep_operation_blkid_tab.ml @@ -0,0 +1,55 @@ +(* virt-sysprep + * Copyright (C) 2012 FUJITSU LIMITED + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + *) + +open Sysprep_operation +open Sysprep_gettext.Gettext + +module G = Guestfs + +let blkid_tab_perform g root = + let typ = g#inspect_get_type root in + if typ <> "windows" then ( + let files = [ "/var/run/blkid.tab"; + "/var/run/blkid.tab.old"; + "/etc/blkid/blkid.tab"; + "/etc/blkid/blkid.tab.old"; + "/etc/blkid.tab"; + "/etc/blkid.tab.old"; + "/dev/.blkid.tab"; + "/dev/.blkid.tab.old"; ] in + List.iter ( + fun file -> + if not (g#is_symlink file) then ( + try g#rm file with G.Error _ -> () + ) + ) files; + + [] + ) + else [] + +let blkid_tab_op = { + name = "blkid-tab"; + enabled_by_default = true; + heading = s_"Remove blkid tab in the guest"; + pod_description = None; + extra_args = []; + perform = blkid_tab_perform; +} + +let () = register_operation blkid_tab_op -- 1.7.10
Looks fine. I'll push it shortly, thanks! Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones virt-df lists disk usage of guests without needing to install any software inside the virtual machine. Supports Linux and Windows. http://et.redhat.com/~rjones/virt-df/
On Wed, May 09, 2012 at 06:08:54PM +0800, Wanlong Gao wrote:
Remove the ca certificates.
Signed-off-by: Wanlong Gao <gaowanlong@cn.fujitsu.com> --- sysprep/Makefile.am | 2 + sysprep/sysprep_operation_ca_certificates.ml | 62 ++++++++++++++++++++++++++ 2 files changed, 64 insertions(+) create mode 100644 sysprep/sysprep_operation_ca_certificates.ml
diff --git a/sysprep/Makefile.am b/sysprep/Makefile.am index d82e5ae..c6292cc 100644 --- a/sysprep/Makefile.am +++ b/sysprep/Makefile.am @@ -35,6 +35,7 @@ SOURCES = \ sysprep_operation.ml \ sysprep_operation.mli \ sysprep_operation_bash_history.ml \ + sysprep_operation_ca_certificates.ml \ sysprep_operation_cron_spool.ml \ sysprep_operation_dhcp_client_state.ml \ sysprep_operation_dhcp_server_state.ml \ @@ -68,6 +69,7 @@ OBJECTS = \ utils.cmx \ sysprep_operation.cmx \ sysprep_operation_bash_history.cmx \ + sysprep_operation_ca_certificates.cmx \ sysprep_operation_cron_spool.cmx \ sysprep_operation_dhcp_client_state.cmx \ sysprep_operation_dhcp_server_state.cmx \ diff --git a/sysprep/sysprep_operation_ca_certificates.ml b/sysprep/sysprep_operation_ca_certificates.ml new file mode 100644 index 0000000..82b4189 --- /dev/null +++ b/sysprep/sysprep_operation_ca_certificates.ml @@ -0,0 +1,62 @@ +(* virt-sysprep + * Copyright (C) 2012 FUJITSU LIMITED + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + *) + +open Sysprep_operation +open Sysprep_gettext.Gettext + +module G = Guestfs + +let ca_certificates_perform g root = + let typ = g#inspect_get_type root in + if typ <> "windows" then ( + let paths = [ "/etc/pki/CA/certs/*"; + "/etc/pki/CA/crl/*"; + "/etc/pki/CA/newcerts/*"; + "/etc/pki/CA/private/*"; + "/etc/pki/tls/private/*"; + "/etc/pki/tls/certs/*.crt"; ] in + let excepts = [ "/etc/pki/tls/certs/ca-bundle.crt"; + "/etc/pki/tls/certs/ca-bundle.trust.crt"; ] in
I've no idea if it is correct to remove these files. These directories on my machines are all empty. Also what happens if a user adds a custom certificate to a machine? Perhaps this operation should be included in sysprep but disabled by default?
+ List.iter ( + fun path -> + let files = g#glob_expand path in + Array.iter ( + fun file -> + List.iter ( + fun except -> + if file <> except then ( + try g#rm file with G.Error _ -> () + ) + ) excepts; + ) files;
The logic here is wrong. As written, this will delete all the files, including exceptions. You probably want to use a set, something like this (not tested): (* put this near to the top of the file, after the 'open's *) module StringSet = Set.Make (String) ... (* expand the paths and add them to a string set *) let paths = List.concat (List.map g#glob_expand paths) in let set = List.fold_right StringSet.add paths StringSet.empty in (* make a set from the exceptions *) let excepts = List.fold_right StringSet.add excepts StringSet.empty in (* remove exceptions from set *) let set = StringSet.diff set excepts in (* remove the remaining files *) StringSet.iter ( fun filename -> try g#rm filename with G.Error _ -> () ) set Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones virt-df lists disk usage of guests without needing to install any software inside the virtual machine. Supports Linux and Windows. http://et.redhat.com/~rjones/virt-df/
On Wed, May 09, 2012 at 12:45:50PM +0100, Richard W.M. Jones wrote:
On Wed, May 09, 2012 at 06:08:54PM +0800, Wanlong Gao wrote:
Remove the ca certificates.
Signed-off-by: Wanlong Gao <gaowanlong@cn.fujitsu.com> --- sysprep/Makefile.am | 2 + sysprep/sysprep_operation_ca_certificates.ml | 62 ++++++++++++++++++++++++++ 2 files changed, 64 insertions(+) create mode 100644 sysprep/sysprep_operation_ca_certificates.ml
diff --git a/sysprep/Makefile.am b/sysprep/Makefile.am index d82e5ae..c6292cc 100644 --- a/sysprep/Makefile.am +++ b/sysprep/Makefile.am @@ -35,6 +35,7 @@ SOURCES = \ sysprep_operation.ml \ sysprep_operation.mli \ sysprep_operation_bash_history.ml \ + sysprep_operation_ca_certificates.ml \ sysprep_operation_cron_spool.ml \ sysprep_operation_dhcp_client_state.ml \ sysprep_operation_dhcp_server_state.ml \ @@ -68,6 +69,7 @@ OBJECTS = \ utils.cmx \ sysprep_operation.cmx \ sysprep_operation_bash_history.cmx \ + sysprep_operation_ca_certificates.cmx \ sysprep_operation_cron_spool.cmx \ sysprep_operation_dhcp_client_state.cmx \ sysprep_operation_dhcp_server_state.cmx \ diff --git a/sysprep/sysprep_operation_ca_certificates.ml b/sysprep/sysprep_operation_ca_certificates.ml new file mode 100644 index 0000000..82b4189 --- /dev/null +++ b/sysprep/sysprep_operation_ca_certificates.ml @@ -0,0 +1,62 @@ +(* virt-sysprep + * Copyright (C) 2012 FUJITSU LIMITED + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + *) + +open Sysprep_operation +open Sysprep_gettext.Gettext + +module G = Guestfs + +let ca_certificates_perform g root = + let typ = g#inspect_get_type root in + if typ <> "windows" then ( + let paths = [ "/etc/pki/CA/certs/*"; + "/etc/pki/CA/crl/*"; + "/etc/pki/CA/newcerts/*"; + "/etc/pki/CA/private/*"; + "/etc/pki/tls/private/*"; + "/etc/pki/tls/certs/*.crt"; ] in + let excepts = [ "/etc/pki/tls/certs/ca-bundle.crt"; + "/etc/pki/tls/certs/ca-bundle.trust.crt"; ] in
I've no idea if it is correct to remove these files. These directories on my machines are all empty. Also what happens if a user adds a custom certificate to a machine? Perhaps this operation should be included in sysprep but disabled by default?
If we're going to do this, then we need to distinguish between CA certificates and server/client certificates. The latter are issued per machine/user and should be removed, the former are global per organization & should be left untouched. While considering this area, we should also kill off any kerberos host principals. Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|
Remove the ca certificates. Signed-off-by: Wanlong Gao <gaowanlong@cn.fujitsu.com> --- sysprep/Makefile.am | 2 + sysprep/sysprep_operation_ca_certificates.ml | 59 ++++++++++++++++++++++++++ 2 files changed, 61 insertions(+) create mode 100644 sysprep/sysprep_operation_ca_certificates.ml diff --git a/sysprep/Makefile.am b/sysprep/Makefile.am index 262a9e3..d24ce13 100644 --- a/sysprep/Makefile.am +++ b/sysprep/Makefile.am @@ -36,6 +36,7 @@ SOURCES = \ sysprep_operation.mli \ sysprep_operation_bash_history.ml \ sysprep_operation_blkid_tab.ml \ + sysprep_operation_ca_certificates.ml \ sysprep_operation_cron_spool.ml \ sysprep_operation_dhcp_client_state.ml \ sysprep_operation_dhcp_server_state.ml \ @@ -71,6 +72,7 @@ OBJECTS = \ sysprep_operation.cmx \ sysprep_operation_bash_history.cmx \ sysprep_operation_blkid_tab.cmx \ + sysprep_operation_ca_certificates.cmx \ sysprep_operation_cron_spool.cmx \ sysprep_operation_dhcp_client_state.cmx \ sysprep_operation_dhcp_server_state.cmx \ diff --git a/sysprep/sysprep_operation_ca_certificates.ml b/sysprep/sysprep_operation_ca_certificates.ml new file mode 100644 index 0000000..f603a1f --- /dev/null +++ b/sysprep/sysprep_operation_ca_certificates.ml @@ -0,0 +1,59 @@ +(* virt-sysprep + * Copyright (C) 2012 FUJITSU LIMITED + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + *) + +open Sysprep_operation +open Sysprep_gettext.Gettext + +module StringSet = Set.Make (String) +module G = Guestfs + +let ca_certificates_perform g root = + let typ = g#inspect_get_type root in + if typ <> "windows" then ( + let paths = [ "/etc/pki/CA/certs/*.crt"; + "/etc/pki/CA/crl/*.crt"; + "/etc/pki/CA/newcerts/*.crt"; + "/etc/pki/CA/private/*.key"; + "/etc/pki/tls/private/*.key"; + "/etc/pki/tls/certs/*.crt"; ] in + let excepts = [ "/etc/pki/tls/certs/ca-bundle.crt"; + "/etc/pki/tls/certs/ca-bundle.trust.crt"; ] in + (* Thanks Rich for this StringSet method *) + let paths = List.concat (List.map Array.to_list (List.map g#glob_expand paths)) in + let set = List.fold_right StringSet.add paths StringSet.empty in + let excepts = List.fold_right StringSet.add excepts StringSet.empty in + let set = StringSet.diff set excepts in + StringSet.iter ( + fun filename -> + try g#rm filename with G.Error _ -> () + ) set; + + [] + ) + else [] + +let ca_certificates_op = { + name = "ca-certificates"; + enabled_by_default = false; + heading = s_"Remove CA certificates in the guest"; + pod_description = None; + extra_args = []; + perform = ca_certificates_perform; +} + +let () = register_operation ca_certificates_op -- 1.7.10
On Fri, May 18, 2012 at 10:49:56AM +0800, Wanlong Gao wrote:
Remove the ca certificates.
Signed-off-by: Wanlong Gao <gaowanlong@cn.fujitsu.com> --- sysprep/Makefile.am | 2 + sysprep/sysprep_operation_ca_certificates.ml | 59 ++++++++++++++++++++++++++ 2 files changed, 61 insertions(+) create mode 100644 sysprep/sysprep_operation_ca_certificates.ml
diff --git a/sysprep/Makefile.am b/sysprep/Makefile.am index 262a9e3..d24ce13 100644 --- a/sysprep/Makefile.am +++ b/sysprep/Makefile.am @@ -36,6 +36,7 @@ SOURCES = \ sysprep_operation.mli \ sysprep_operation_bash_history.ml \ sysprep_operation_blkid_tab.ml \ + sysprep_operation_ca_certificates.ml \ sysprep_operation_cron_spool.ml \ sysprep_operation_dhcp_client_state.ml \ sysprep_operation_dhcp_server_state.ml \ @@ -71,6 +72,7 @@ OBJECTS = \ sysprep_operation.cmx \ sysprep_operation_bash_history.cmx \ sysprep_operation_blkid_tab.cmx \ + sysprep_operation_ca_certificates.cmx \ sysprep_operation_cron_spool.cmx \ sysprep_operation_dhcp_client_state.cmx \ sysprep_operation_dhcp_server_state.cmx \ diff --git a/sysprep/sysprep_operation_ca_certificates.ml b/sysprep/sysprep_operation_ca_certificates.ml new file mode 100644 index 0000000..f603a1f --- /dev/null +++ b/sysprep/sysprep_operation_ca_certificates.ml @@ -0,0 +1,59 @@ +(* virt-sysprep + * Copyright (C) 2012 FUJITSU LIMITED + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + *) + +open Sysprep_operation +open Sysprep_gettext.Gettext + +module StringSet = Set.Make (String) +module G = Guestfs + +let ca_certificates_perform g root = + let typ = g#inspect_get_type root in + if typ <> "windows" then ( + let paths = [ "/etc/pki/CA/certs/*.crt"; + "/etc/pki/CA/crl/*.crt"; + "/etc/pki/CA/newcerts/*.crt"; + "/etc/pki/CA/private/*.key"; + "/etc/pki/tls/private/*.key"; + "/etc/pki/tls/certs/*.crt"; ] in + let excepts = [ "/etc/pki/tls/certs/ca-bundle.crt"; + "/etc/pki/tls/certs/ca-bundle.trust.crt"; ] in + (* Thanks Rich for this StringSet method *) + let paths = List.concat (List.map Array.to_list (List.map g#glob_expand paths)) in + let set = List.fold_right StringSet.add paths StringSet.empty in + let excepts = List.fold_right StringSet.add excepts StringSet.empty in + let set = StringSet.diff set excepts in + StringSet.iter ( + fun filename -> + try g#rm filename with G.Error _ -> () + ) set; + + [] + ) + else [] + +let ca_certificates_op = { + name = "ca-certificates"; + enabled_by_default = false; + heading = s_"Remove CA certificates in the guest"; + pod_description = None; + extra_args = []; + perform = ca_certificates_perform; +} + +let () = register_operation ca_certificates_op -- 1.7.10
ACK. I think disabled by default is safer, thanks. I'll push this today once I've run some tests. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones virt-top is 'top' for virtual machines. Tiny program with many powerful monitoring features, net stats, disk stats, logging, etc. http://et.redhat.com/~rjones/virt-top
participants (3)
-
Daniel P. Berrange -
Richard W.M. Jones -
Wanlong Gao