Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use more exact regex for Bitbucket strategy. #10068

Merged
merged 4 commits into from Dec 22, 2020
Merged

Use more exact regex for Bitbucket strategy. #10068

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4abcfdb
Use more exact regex as `URL_MATCH_REGEX` for `Bitbucket` strategy.
reitermarkus Dec 14, 2020
cbbc932
Don't replace string inside of `MatchData`.
reitermarkus Dec 19, 2020
21b1888
Bitbucket: Anchor start of regex with protocol
samford Dec 20, 2020
466e55c
Bitbucket: Format regex like other strategies
samford Dec 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
28 changes: 14 additions & 14 deletions Library/Homebrew/livecheck/strategy/bitbucket.rb
View file
Open in desktop
Expand Up @@ -29,7 +29,14 @@ module Strategy
# @api public
class Bitbucket
# The `Regexp` used to determine if the strategy applies to the URL.
URL_MATCH_REGEX = %r{bitbucket\.org(/[^/]+){4}\.\w+}i.freeze
URL_MATCH_REGEX = %r{
^https?://bitbucket\.org
/(?<path>.+?) # The path leading up to the get or downloads part
/(?<dl_type>get|downloads) # An indicator of the file download type
/(?<prefix>(?:[^/]+?[_-])?) # Filename text before the version
v?\d+(?:\.\d+)+ # The numeric version
(?<suffix>[^/]+) # Filename text after the version
}ix.freeze

# Whether the strategy can be applied to the provided URL.
#
Expand All @@ -46,30 +53,23 @@ def self.match?(url)
# @param regex [Regexp] a regex used for matching versions in content
# @return [Hash]
def self.find_versions(url, regex = nil)
%r{
bitbucket\.org/
(?<path>.+?)/ # The path leading up to the get or downloads part
(?<dl_type>get|downloads)/ # An indicator of the file download type
(?<prefix>(?:[^/]+?[_-])?) # Filename text before the version
v?\d+(?:\.\d+)+ # The numeric version
(?<suffix>[^/]+) # Filename text after the version
}ix =~ url
match = url.match(URL_MATCH_REGEX)

# Use `\.t` instead of specific tarball extensions (e.g. .tar.gz)
suffix.sub!(/\.t(?:ar\..+|[a-z0-9]+)$/i, "\.t")
suffix = match[:suffix].sub(/\.t(?:ar\..+|[a-z0-9]+)$/i, "\.t")

# `/get/` archives are Git tag snapshots, so we need to check that tab
# instead of the main `/downloads/` page
page_url = if dl_type == "get"
"https://bitbucket.org/#{path}/downloads/?tab=tags"
page_url = if match[:dl_type] == "get"
"https://bitbucket.org/#{match[:path]}/downloads/?tab=tags"
else
"https://bitbucket.org/#{path}/downloads/"
"https://bitbucket.org/#{match[:path]}/downloads/"
end

# Example regexes:
# * `/href=.*?v?(\d+(?:\.\d+)+)\.t/i`
# * `/href=.*?example-v?(\d+(?:\.\d+)+)\.t/i`
regex ||= /href=.*?#{Regexp.escape(prefix)}v?(\d+(?:\.\d+)+)#{Regexp.escape(suffix)}/i
regex ||= /href=.*?#{Regexp.escape(match[:prefix])}v?(\d+(?:\.\d+)+)#{Regexp.escape(suffix)}/i

Homebrew::Livecheck::Strategy::PageMatch.find_versions(page_url, regex)
end
Expand Down