Skip to content

fix: VCS regex matches all valid usernames for each provider; URLs are now case-insensitive, dokku check extended #485

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

Merged
merged 7 commits into from
Dec 25, 2020
Merged

fix: VCS regex matches all valid usernames for each provider; URLs are now case-insensitive, dokku check extended #485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
539a793
fixed vcs regex to allow upper case
JeremyRudman Dec 22, 2020
93bb9aa
fixed houndci complaints
JeremyRudman Dec 23, 2020
4d858e8
Merge branch 'develop' into hm-476a
JeremyRudman Dec 25, 2020
3a5a546
lossened username regex and add another test
JeremyRudman Dec 25, 2020
838057f
made regex more pleasing to read
JeremyRudman Dec 25, 2020
2b31ac2
made regex method more readable
JeremyRudman Dec 25, 2020
dbc443a
checks now does 300 attempts
JeremyRudman Dec 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHECKS
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
WAIT=10
ATTEMPTS=20
ATTEMPTS=300

/users/sign_in Sign in to
7 changes: 6 additions & 1 deletion app/models/questionnaire.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,10 @@ class Questionnaire < ApplicationRecord

validates :portfolio_url, url: { allow_blank: true }
validates :vcs_url, url: { allow_blank: true }
validates_format_of :vcs_url, with: %r{\A(((https?:\/\/)?(www\.)?github\.com\/\w+\/?)|((https?:\/\/)?(www\.)?gitlab\.com\/\w+\/?)|((https?:\/\/)?(www\.)?bitbucket\.org\/\w+\/?))\z}, allow_blank: true, message: "Must be a GitHub, GitLab or Bitbucket url"
validates_format_of :vcs_url,
with: %r{\A((https?:\/\/)?(www\.)?((github\.com)|(gitlab\.com)|(bitbucket\.org))\/(.*){0,62})\z}i,
allow_blank: true,
message: "Must be a GitHub, GitLab or Bitbucket url"
strip_attributes

POSSIBLE_EXPERIENCES = {
Expand Down Expand Up @@ -129,11 +132,13 @@ def email
end

def portfolio_url=(value)
value = value.downcase unless value.blank?
value = "http://" + value if !value.blank? && !value.include?("http://") && !value.include?("https://")
super value
end

def vcs_url=(value)
value = value.downcase unless value.blank?
value = "https://" + value if !value.blank? && !value.include?("http://") && !value.include?("https://")
super value
end
Expand Down
2 changes: 2 additions & 0 deletions test/models/questionnaire_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,8 @@ class QuestionnaireTest < ActiveSupport::TestCase
should allow_value('foo.com').for(:portfolio_url)
should allow_value('github.com/foo', 'gitlab.com/bar', 'bitbucket.org/baz').for(:vcs_url)
should allow_value('https://github.com/foo', 'https://gitlab.com/bar', 'https://bitbucket.org/baz').for(:vcs_url)
should allow_value('HttPs://gITHub.CoM/foo', 'hTTp://gitLAB.coM/bar').for(:vcs_url)
should allow_value('wWw.gITHub.CoM/fOo', 'hTTp://wWw.gitLAB.coM/f-fc-vx').for(:vcs_url)
should_not allow_value('http://foo.com', 'https://bar.com').for(:vcs_url)

context "#school" do
Expand Down