FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Fix regex in validator by kachick · Pull Request #121 · bcrypt-ruby/bcrypt-ruby · GitHub

  1. bcrypt-ruby
  2. bcrypt-ruby

Repository navigation

Fix regex in validator - #121

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

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

Conversation

kachick commented Sep 25, 2015

Copy link
Copy Markdown
Contributor 
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 closed this Oct 27, 2015
tenderlove reopened this Oct 27, 2015

tenderlove commented Oct 27, 2015

Copy link
Copy Markdown
Collaborator

(just bumping for CI)

kachick commented Oct 28, 2015

Copy link
Copy Markdown
Contributor Author

@tenderlove 🙇

olleolleolle commented Apr 12, 2019

Copy link
Copy Markdown
Contributor

Can this be merged, now?

kachick commented Mar 2, 2021

Copy link
Copy Markdown
Contributor Author

@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 commented Mar 2, 2021 •
edited
Loading

Copy link
Copy Markdown
Contributor

@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 commented Mar 2, 2021

Copy link
Copy Markdown
Contributor Author

@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 commented Mar 2, 2021

Copy link
Copy Markdown
Contributor Author

Rebased!

kachick commented Mar 2, 2021 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

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

kachick commented Mar 2, 2021

Copy link
Copy Markdown
Contributor Author

CI ✅

tjschuck merged commit 2dfe508 into bcrypt-ruby:master Mar 2, 2021

kachick commented Mar 2, 2021

Copy link
Copy Markdown
Contributor Author

Thank you!

kachick deleted the fix-regex-in-validator branch March 2, 2021 19:23
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
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

Back | FazBrowse Home | New Git URL