Skip to content

Fix regex in validator#121

Merged
tjschuck merged 1 commit into
bcrypt-ruby:masterfrom
kachick:fix-regex-in-validator
Mar 2, 2021
Merged

Fix regex in validator#121
tjschuck merged 1 commit into
bcrypt-ruby:masterfrom
kachick:fix-regex-in-validator

Conversation

@kachick
Copy link
Copy Markdown
Contributor

@kachick kachick commented Sep 25, 2015 

valid_salt = BCrypt::Engine.generate_salt
BCrypt::Engine.valid_salt? "invalid\n#{valid_salt}\ninvalid" #=> true, expected: falsey
valid_hash = BCrypt::Password.create 'i_am_so_valid'
BCrypt::Password.valid_hash? "invalid\n#{valid_hash}\ninvalid" #=> 8, expected: falsey

@tenderlove tenderlove closed this Oct 27, 2015
@tenderlove tenderlove reopened this Oct 27, 2015
@tenderlove
Copy link
Copy Markdown
Collaborator

tenderlove commented Oct 27, 2015

(just bumping for CI)

@kachick
Copy link
Copy Markdown
Contributor Author

kachick commented Oct 28, 2015

@tenderlove 🙇

@olleolleolle
Copy link
Copy Markdown
Contributor

olleolleolle commented Apr 12, 2019

Can this be merged, now?

@kachick
Copy link
Copy Markdown
Contributor Author

kachick commented Mar 2, 2021

@tenderlove @olleolleolle

  1. Initial my patch conflicted to current master branch
  2. current master branch still has same issue
  3. So fixed the conflict in e6735e5

🙏

@olleolleolle
Copy link
Copy Markdown
Contributor

olleolleolle commented Mar 2, 2021 •
edited
Loading

@kachick Perhaps we can make a new PR which fixes the regular expression problems, from the current latest code? (As an easier way to avoid conflict problems.) The linked diff seemed large, while this PR's fix seems small (smaller would be better, in this case).

What do you think?

Update: All my worry was alleviated by a rebase.

@kachick
Copy link
Copy Markdown
Contributor Author

kachick commented Mar 2, 2021

@olleolleolle https://github.com/codahale/bcrypt-ruby/pull/121/files is the actual diff of this PR, that does not contain noisy diff 🤔

Ok, I'll rebase this PR to relieve your worry 😄

@kachick
Copy link
Copy Markdown
Contributor Author

kachick commented Mar 2, 2021

Rebased!

@kachick
Copy link
Copy Markdown
Contributor Author

kachick commented Mar 2, 2021 •
edited
Loading

Ah sorry, splitting to 2 commits looks broken now 😓 , I'll squash

@kachick
Copy link
Copy Markdown
Contributor Author

kachick commented Mar 2, 2021

CI ✅

@tjschuck tjschuck merged commit 2dfe508 into bcrypt-ruby:master Mar 2, 2021
@kachick
Copy link
Copy Markdown
Contributor Author

kachick commented Mar 2, 2021

Thank you!

@kachick kachick deleted the fix-regex-in-validator branch March 2, 2021 19:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@kachick @tenderlove @olleolleolle @tjschuck