Skip to content

Commit

Permalink
Allow sha checksums
Browse files Browse the repository at this point in the history 
* Also show info about signature
  • Loading branch information
@joseivanlopez
joseivanlopez committed Feb 19, 2020
1 parent 736ab82 commit efeac62
Show file tree
Hide file tree
Showing 2 changed files with 90 additions and 61 deletions.
101 changes: 49 additions & 52 deletions src/include/checkmedia/ui.rb
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
# Copyright (c) [2013-2020] SUSE LLC
#
# All Rights Reserved.
#
# This program is free software; you can redistribute it and/or modify it
# under the terms of version 2 of the GNU General Public License as published
# by the Free Software Foundation.
#
# 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, contact SUSE LLC.
#
# To contact SUSE LLC about this file by physical or electronic mail, you may
# find current contact information at www.suse.com.

require "shellwords"

# encoding: utf-8
Expand Down Expand Up @@ -71,10 +90,11 @@ def TranslateInfo(info)

ret = []

Builtins.foreach(info) do |i|
parts = Builtins.splitstring(i, ":")
key = String.CutBlanks(Ops.get(parts, 0, ""))
val = String.CutBlanks(Ops.get(parts, 1, ""))
info.each do |i|
key, val = i.split(":").map(&:strip)

next unless key

trasmap = {
# rich text message, %1 = CD identification
"app" => Ops.add(
Expand All @@ -86,23 +106,27 @@ def TranslateInfo(info)
"<UL><LI>Medium: %1</LI></UL>"
),
# rich text message, %1 = size of the medium
"size" => _(
"iso size" => _(
"<UL><LI>Size: %1</LI></UL>"
),
# rich text message, %1 = result of the check
"check" => _(
"result" => _(
"<UL><LI>Result: %1</LI></UL>"
),
# rich text message, %1 = signature check
"signature" => _(
"<UL><LI>Signature: %1</LI></UL>"
),
# rich text - error message
"not an iso" => "<FONT COLOR=red>" +
_(
"The drive does not contain a medium or the ISO file system is broken."
) + "</FONT>"
}
if key == "check"

if key == "result"
# try to translate result string
# correct MD5
if val == "md5sum ok"
if val.match?(/ok/)
# result of the check - success
val = "<FONT COLOR=\"darkGreen\">" +
_("<B>OK</B> -- The medium has been successfully verified.") + "</FONT>"
Expand All @@ -117,49 +141,24 @@ def TranslateInfo(info)
val = _(
"<B>Unknown</B> -- The correct MD5 sum of the medium is unknown."
)
# progress output
elsif Builtins.issubstring(val, "%\b\b\b\b")
key = ""
Builtins.y2milestone(
"Ignoring progress output: %1",
Builtins.mergestring(Builtins.splitstring(val, "\b"), "\\b")
)
end
# don't print MD5 sum (it doesn't help user)
elsif key == "md5"
Builtins.y2milestone("Expected MD5 of the medium: %1", val)
key = ""
end
newstr = Ops.get(trasmap, key, "")
if !newstr.nil? && newstr != ""
newstr = Builtins.sformat(newstr, val)

ret = Builtins.add(ret, newstr)
end
end
# don't print checksum (it doesn't help user)
Builtins.y2milestone("Expected checksum of the medium: %1", val) if key.match?(/md5|sha.*/)

Builtins.y2milestone("Translated info: %1", ret)

deep_copy(ret)
end
newstr = Ops.get(trasmap, key, "")

# does the medium contain MD5 checksum in the application area?
def md5sumTagPresent(input)
command = "/usr/bin/dd if=#{input.shellescape} bs=1 skip=33651 count=512"
next if newstr.nil? || newstr.empty?

res = SCR.Execute(path(".target.bash_output"), command)
newstr = Builtins.sformat(newstr, val)

if Ops.get_integer(res, "exit", -1).nonzero?
Builtins.y2warning("command failed: %1", command)
return nil
ret = Builtins.add(ret, newstr)
end

Builtins.y2milestone(
"Read application area: %1",
Ops.get_string(res, "stdout", "")
)
Builtins.y2milestone("Translated info: %1", ret)

Builtins.regexpmatch(Ops.get_string(res, "stdout", ""), "md5sum=")
deep_copy(ret)
end

# mount CD drive and check whether there is directory 'media.1' (the first medium)
Expand Down Expand Up @@ -447,17 +446,15 @@ def MainDialog
)
)
else
if md5sumTagPresent(selecteddrive) == false
if !Popup.ContinueCancel(
_(
"The medium does not contain a MD5 checksum.\n" \
"The content of the medium cannot be verified.\n" \
"\n" \
"Only readability of the medium will be checked.\n"
)
if !CheckMedia.valid_checksum?(selecteddrive)
continue_checking = Popup.ContinueCancel(
_("The medium does not contain a valid checksum.\n" \
"The content of the medium cannot be verified.\n" \
"\n" \
"Only readability of the medium will be checked.\n")
)
next
end

next unless continue_checking
end

CheckMedia.Start(selecteddrive)
Expand Down
50 changes: 41 additions & 9 deletions src/modules/CheckMedia.rb
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,25 @@
# Copyright (c) [2013-2020] SUSE LLC
#
# All Rights Reserved.
#
# This program is free software; you can redistribute it and/or modify it
# under the terms of version 2 of the GNU General Public License as published
# by the Free Software Foundation.
#
# 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, contact SUSE LLC.
#
# To contact SUSE LLC about this file by physical or electronic mail, you may
# find current contact information at www.suse.com.

require "yast"
require "yast2/execute"
require "shellwords"

# Yast namespace
module Yast
Expand Down Expand Up @@ -82,9 +103,11 @@ def Process

# try to read whole lines
out = Convert.to_string(SCR.Read(path(".process.read_line"), @process))

if @inprogress
# read progress status
buffer = Convert.to_string(SCR.Read(path(".process.read"), @process))

if !out.nil?
@output = Builtins.add(@output, out)

Expand All @@ -96,9 +119,11 @@ def Process
)
end

# finished
@progress = 100
@inprogress = false
# finishing if there is no out and the progress was already started
if @progress > 0
@progress = 100
@inprogress = false
end
elsif !buffer.nil?
Builtins.y2debug("buffer: %1", buffer)

Expand All @@ -111,12 +136,10 @@ def Process
end
elsif !out.nil?
@output = Builtins.add(@output, out)

# check whether we need to switch to progress mode
if Builtins.regexpmatch(out, "^ *pad: ")
@inprogress = true
Builtins.y2milestone("Switching into progress mode")
end
else
Builtins.y2milestone("Switching into progress mode")
@inprogress = true
@progress = 0
end

nil
Expand Down Expand Up @@ -194,6 +217,15 @@ def Release
nil
end

# Whether the medium inside the drive contains a checksum in the application area
#
# @return [Boolean]
def valid_checksum?(drive)
tagmedia = Execute.locally.stdout("tagmedia", drive.shellescape)

tagmedia.match?(/^(md5|sha.*)sum =/)
end

publish variable: :checkmedia, type: "const string"
publish variable: :preferred_drive, type: "string"
publish variable: :forced_start, type: "boolean"
Expand Down

0 comments on commit efeac62

Please sign in to comment.