search for: ssh_dir

...++++++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/customize/ssh_key.ml b/customize/ssh_key.ml index 09664bf..dd6056f 100644 --- a/customize/ssh_key.ml +++ b/customize/ssh_key.ml @@ -119,14 +119,14 @@ let do_ssh_inject_unix (g : Guestfs.guestfs) user selector = let ssh_dir = sprintf "%s/.ssh" home_dir in if not (g#exists ssh_dir) then ( g#mkdir ssh_dir; - g#chmod 0o755 ssh_dir + g#chmod 0o700 ssh_dir ); (* Create ~user/.ssh/authorized_keys if it doesn't exist. *) let auth_keys = sprintf "%s/authorized_keys" ssh_dir in...

...ser selector = user in let home_dir = read_user_detail "home" in + let uid = int_of_string (read_user_detail "uid") in + let gid = int_of_string (read_user_detail "gid") in g#aug_close (); (* Create ~user/.ssh if it doesn't exist. *) let ssh_dir = sprintf "%s/.ssh" home_dir in if not (g#exists ssh_dir) then ( g#mkdir ssh_dir; - g#chmod 0o700 ssh_dir + g#chmod 0o700 ssh_dir; + g#chown uid gid ssh_dir; ); (* Create ~user/.ssh/authorized_keys if it doesn't exist. *) let auth_keys = sprintf "%s/au...

Turn the snippet reading user information from /etc/passwd in a slightly more generic function, so there is no need to copy&paste for other details. Mostly code motion. --- customize/ssh_key.ml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/customize/ssh_key.ml b/customize/ssh_key.ml index a4e4a51..7c482e7 100644 --- a/customize/ssh_key.ml +++

...id.*\\.pub$" in + let pubkey_ignore_re = Str.regexp ".*-cert\\.pub$" in + + let local_user_ssh_pubkey () = + let home_dir = + try getenv "HOME" + with Not_found -> + error (f_"ssh-inject: $HOME environment variable is not set") in + let ssh_dir = home_dir // ".ssh" in + let files = Sys.readdir ssh_dir in + let files = Array.to_list files in + let files = List.filter ( + fun file -> + Str.string_match pubkey_re file 0 && + not (Str.string_match pubkey_ignore_re file 0) + ) files in +...

...= Str.regexp "^id.*\\.pub$" +let pubkey_ignore_re = Str.regexp ".*-cert\\.pub$" + +let local_user_ssh_pubkey () = + let home_dir = + try getenv "HOME" + with Not_found -> + error (f_"ssh-inject: $HOME environment variable is not set") in + let ssh_dir = home_dir // ".ssh" in + let files = Sys.readdir ssh_dir in + let files = Array.to_list files in + let files = List.filter ( + fun file -> + Str.string_match pubkey_re file 0 && + not (Str.string_match pubkey_ignore_re file 0) + ) files in + if files = [] t...

Str is a pretty ugly regexp module. Let's try to replace it with PCRE. This series of commits goes some small way towards that eventual goal. - - - I wonder if there was a deep reason why we had this? let unix2dos s = String.concat "\r\n" (Str.split_delim (Str.regexp_string "\n") s) I replaced it with what I think should be (nearly) equivalent: let unix2dos s =

v1 was here: https://www.redhat.com/archives/libguestfs/2017-September/msg00135.html This is a more complete evolution of the earlier patch. It replaces most important uses of Str with PCRE throughout the code. It also extends the bindings with some useful features like case-insensitive regexps. The main places I *didn't* touch are the generator (GObject uses Str extensively); and

v1: https://www.redhat.com/archives/libguestfs/2017-September/msg00135.html v2: https://www.redhat.com/archives/libguestfs/2017-September/msg00158.html v3 is almost identical to v2, but I have added 4 extra commits to almost finish the job of replacing Str everywhere possible (note it's not possible to replace Str in common/mlstdutils or the generator because those are pure OCaml). As