search for: do_verify

...builder/sigchecker.mli | 4 ++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/builder/sigchecker.ml b/builder/sigchecker.ml index 86e60ac..42d55cd 100644 --- a/builder/sigchecker.ml +++ b/builder/sigchecker.ml @@ -182,12 +182,30 @@ and verify_detached t filename sigfile = do_verify t args ) -and do_verify t args = +and verify_and_remove_signature t filename = + if t.check_signature then ( + (* Copy the input file as temporary file with the .asc extension, + * so gpg recognises that format. *) + let asc_file = Filename.temp_file "vbfile" ".asc&qu...

Much similar to unlink_on_exit, but recursively cleaning directories. --- mllib/common_utils.ml | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/mllib/common_utils.ml b/mllib/common_utils.ml index 3943417..f49ede6 100644 --- a/mllib/common_utils.ml +++ b/mllib/common_utils.ml @@ -386,6 +386,35 @@ let unlink_on_exit = registered_handlers := true )

Parse the gpg status output directly within import_keyfile, returning just the key fingerprint. Just code motion, no actual behaviour changes. --- builder/sigchecker.ml | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/builder/sigchecker.ml b/builder/sigchecker.ml index 0c292fb..a1a4220 100644 --- a/builder/sigchecker.ml +++ b/builder/sigchecker.ml

...debug = debug; > gpg = gpg; > fingerprint = fingerprint; > check_signature = check_signature; > + gpghome = tmpdir; > + key_imported = false; > } > > (* Compare two strings of hex digits ignoring whitespace and case. *) > @@ -159,8 +176,9 @@ and do_verify t args = > let status_file = Filename.temp_file "vbstat" ".txt" in > unlink_on_exit status_file; > let cmd = > - sprintf "%s --verify%s --status-file %s %s" > - t.gpg (if t.debug then "" else " -q --logger-file /dev/null...

...1; - let out_file = Filename.temp_file "vbfile" "" in - unlink_on_exit out_file; + let out_file = Filename.temp_file ~temp_dir:t.tmpdir "vbfile" "" in let args = sprintf "--yes --output %s %s" (quote out_file) (quote filename) in do_verify ~verify_only:false t args; Some out_file @@ -192,8 +189,7 @@ and verify_and_remove_signature t filename = None and do_verify ?(verify_only = true) t args = - let status_file = Filename.temp_file "vbstat" ".txt" in - unlink_on_exit status_file; + let status_file =...

...1; - let out_file = Filename.temp_file "vbfile" "" in - unlink_on_exit out_file; + let out_file = Filename.temp_file ~temp_dir:t.tmpdir "vbfile" "" in let args = sprintf "--yes --output %s %s" (quote out_file) (quote filename) in do_verify ~verify_only:false t args; Some out_file @@ -192,8 +189,7 @@ and verify_and_remove_signature t filename = None and do_verify ?(verify_only = true) t args = - let status_file = Filename.temp_file "vbstat" ".txt" in - unlink_on_exit status_file; + let status_file =...

Hi, this series adds a basic support for Simple Streams v1.0 metadata files. This makes it possible to create a repository .conf files with [cirros] uri=http://download.cirros-cloud.net format=simplestreams to read the latest version of each CirrOS image. TODO items: - a bit more testing: listing and creating images works, so the current metadata is correct - handle revisions, so newer

Add a new optional parameter for the Curl ADT, so temporary files can be created in a specified directory (which is supposed to be temporary, and disposed only when the application quits). --- mllib/curl.ml | 10 ++++++---- mllib/curl.mli | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/mllib/curl.ml b/mllib/curl.ml index 376406e..baa75ec 100644 --- a/mllib/curl.ml +++

...l gpg output is printed in verbose mode anyway). --- builder/sigchecker.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builder/sigchecker.ml b/builder/sigchecker.ml index b54977f..29f271b 100644 --- a/builder/sigchecker.ml +++ b/builder/sigchecker.ml @@ -159,7 +159,7 @@ and do_verify t args = let cmd = sprintf "%s --homedir %s --verify%s --status-file %s %s" t.gpg t.gpghome - (if t.verbose then "" else " -q --logger-file /dev/null") + (if t.verbose then "" else " --batch -q --logger-file /dev/null"...

...- fp + import_keyfile gpg tmpdir filename ) else - "" in + "", [] in { gpg = gpg; fingerprint = fingerprint; + subkeys_fingerprints = subkeys; check_signature = check_signature; gpghome = tmpdir; } @@ -177,6 +205,7 @@ and do_verify t args = | _ -> () ) status; - if not (equal_fingerprints !fingerprint t.fingerprint) then + if not (equal_fingerprints !fingerprint t.fingerprint) && + not (List.exists (equal_fingerprints !fingerprint) t.subkeys_fingerprints) then error (f_"fingerprint of sig...

Add a new optional parameter for the Curl ADT, so temporary files can be created in a specified directory (which is supposed to be temporary, and disposed only when the application quits). --- mllib/curl.ml | 16 +++++++++++----- mllib/curl.mli | 2 +- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/mllib/curl.ml b/mllib/curl.ml index 376406e..7d07125 100644 --- a/mllib/curl.ml

...(Checksums.string_of_csum_t (Checksums.SHA512 uri)) uri ); fp "revision=%d\n" revision; (match format with diff --git a/builder/sigchecker.ml b/builder/sigchecker.ml index 55db7af..cb9144f 100644 --- a/builder/sigchecker.ml +++ b/builder/sigchecker.ml @@ -180,28 +180,3 @@ and do_verify t args = if not (equal_fingerprints !fingerprint t.fingerprint) then error (f_"fingerprint of signature does not match the expected fingerprint!\n found fingerprint: %s\n expected fingerprint: %s") !fingerprint t.fingerprint - -type csum_t = SHA512 of string - -let verify...

...(quote filename) (quote asc_file) in - if verbose () then printf "%s\n%!" cmd; + debug "%s" cmd; if Sys.command cmd <> 0 then exit 1; let out_file = Filename.temp_file "vbfile" "" in unlink_on_exit out_file; @@ -208,7 +208,7 @@ and do_verify ?(verify_only = true) t args = (if verify_only then "--verify" else "") (if verbose () then "" else " --batch -q --logger-file /dev/null") (quote status_file) args in - if verbose () then printf "%s\n%!" cmd; + debug &qu...

Add a Common_utils.debug function for printing messages only when in verbose mode. Rich.

Add an optional parameter to disable this behaviour, so the Curl module in v2v won't print user-sensible data (like passwords). --- builder/checksums.ml | 1 - builder/downloader.ml | 1 - builder/sigchecker.ml | 1 - mllib/common_utils.ml | 4 +++- mllib/common_utils.mli | 7 +++++-- v2v/curl.ml | 2 +- 6 files changed, 9 insertions(+), 7 deletions(-) diff --git

...rue) keyfile = (match !current with | None -> () | Some k -> - if string_suffix id k then ( + if String.is_suffix id k then ( subkeys := id :: !subkeys; ); current := None @@ -216,11 +216,11 @@ and do_verify ?(verify_only = true) t args = (* Check the fingerprint is who it should be. *) let status = read_whole_file status_file in - let status = string_nsplit "\n" status in + let status = String.nsplit "\n" status in let fingerprint = ref "" in List.iter (...

Hide/prevent the use of bad string functions like String.lowercase. These are replaced by safe functions that won't break UTF-8 strings. Other miscellaneous refactoring. Rich.

...ignore (import_keyfile gpg tmpdir verbose filename); + ignore (import_keyfile gpg tmpdir filename); fp ) else "" in { - verbose = verbose; gpg = gpg; fingerprint = fingerprint; check_signature = check_signature; @@ -159,9 +157,9 @@ and do_verify t args = let cmd = sprintf "%s --homedir %s --verify%s --status-file %s %s" t.gpg t.gpghome - (if t.verbose then "" else " --batch -q --logger-file /dev/null") + (if verbose () then "" else " --batch -q --logger-file /dev/n...

...39;-v' option and look for earlier error messages."); + error (f_"could not export public key\nUse the ‘-v’ option and look for earlier error messages."); import_keyfile gpg gpgtmpdir tmpdir filename ) else "", [] in @@ -199,7 +199,7 @@ and do_verify ?(verify_only = true) t args = (quote status_file) args in let r = shell_command cmd in if r <> 0 then - error (f_"GPG failure: could not verify digital signature of file\nTry:\n - Use the '-v' option and look for earlier error messages.\n - Delete the cache: vi...

.. and a lot of refactoring. https://bugzilla.redhat.com/show_bug.cgi?id=1167623 Rich.