[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [Libguestfs] [PATCH V2] sysprep: remove ca certificates in the guest



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


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]