serialize :properties, Hash
+ before_validation :default_empty_manifest
before_validation :check_encoding
+ before_validation :check_manifest_validity
before_validation :check_signatures
before_validation :strip_signatures_and_update_replication_confirmed
validate :ensure_pdh_matches_manifest_text
api_token: api_token,
now: db_current_time.to_i,
}
- self.manifest_text.lines.each do |entry|
- entry.split[1..-1].each do |tok|
- if tok =~ FILE_TOKEN
+ self.manifest_text.each_line do |entry|
+ entry.split.each do |tok|
+ if tok == '.' or tok.starts_with? './'
+ # Stream name token.
+ elsif tok =~ FILE_TOKEN
# This is a filename token, not a blob locator. Note that we
# keep checking tokens after this, even though manifest
# format dictates that all subsequent tokens will also be
true
elsif portable_data_hash.nil? or not portable_data_hash_changed?
self.portable_data_hash = computed_pdh
- elsif portable_data_hash !~ /^[0-9a-f]{32}(\+\d+)?$/
- errors.add(:portable_data_hash, "is not a valid hash or hash+size")
+ elsif portable_data_hash !~ Keep::Locator::LOCATOR_REGEXP
+ errors.add(:portable_data_hash, "is not a valid locator")
false
elsif portable_data_hash[0..31] != computed_pdh[0..31]
errors.add(:portable_data_hash,
names[0,2**12]
end
+ def default_empty_manifest
+ self.manifest_text ||= ''
+ end
+
def check_encoding
if manifest_text.encoding.name == 'UTF-8' and manifest_text.valid_encoding?
true
end
end
+ def check_manifest_validity
+ begin
+ Keep::Manifest.validate! manifest_text
+ true
+ rescue ArgumentError => e
+ errors.add :manifest_text, e.message
+ false
+ end
+ end
+
def signed_manifest_text
if has_attribute? :manifest_text
token = current_api_client_authorization.andand.api_token
# for each locator. Return a new manifest in which each locator
# has been replaced by the block's return value.
return nil if !manifest
- return '' if !manifest.present?
+ return '' if manifest == ''
new_lines = []
- lines = manifest.split("\n")
manifest.each_line do |line|
line.rstrip!
- words = line.split(' ')
new_words = []
- words.each do |word|
- if match = Keep::Locator::LOCATOR_REGEXP.match(word)
+ line.split(' ').each do |word|
+ if new_words.empty?
+ new_words << word
+ elsif match = Keep::Locator::LOCATOR_REGEXP.match(word)
new_words << yield(match)
else
new_words << word
end
new_lines << new_words.join(' ')
end
-
- manifest = new_lines.join("\n") + "\n"
+ new_lines.join("\n") + "\n"
end
def self.each_manifest_locator manifest
# Given a manifest text and a block, yield the regexp match object
# for each locator.
manifest.each_line do |line|
- line.rstrip!
- words = line.split(' ')
- words.each do |word|
+ # line will have a trailing newline, but the last token is never
+ # a locator, so it's harmless here.
+ line.split(' ').each do |word|
if match = Keep::Locator::LOCATOR_REGEXP.match(word)
yield(match)
end