Skip to content

Conversation

propersam
Copy link
Contributor

For good User experience sake, I find it stressful when I just copy and paste password into the login page or type blindly into the password field without knowing what was entered. Sometimes my keyboard even enters a key twice and then there's no way of cross checking what I typed in like logging in to my gmail account for example. So I decided to take my time to add the toggle password functionality to the login page for myself and made a pull request in case of someone else that might need it. 😃

propersam and others added 14 commits April 1, 2019 20:38
… docker-compose. People are getting tripped up by installs that aren't up to date
* fix#982

* update

* Handle Burp Collaborator issues

This is an enhancement in order to handle findings that contain Burp collaborator interactions which have additional request/response pairs and additional information that was normally ignored or breaking the importing of the report .

* Fix flake8 errors

* More accessibility fixes for top and side menu

* Made search button accessible

* tune uwsgi read timeout (troubleshoots 'upstream timed out' on POST import_scan_results)

* add a different docker-compose for dev and for release

* add a different docker-compose for dev and for release

* Update README.md

* cicd engagement: after delete return to cicd engagement view

* Updated DOCKER.md in dev branch to include info on checking versions for docker and docker-compose. People are getting tripped up by installs that aren't up to date

* Docker readme update

* Travis compose sourcing script

* Github template DB addition, docker sourcing
Copy link
Member

@valentijnscholten valentijnscholten left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good but could you remove the http-timeout addition from the PR?

@propersam
Copy link
Contributor Author

I did nt add that..dont even know what it's for...it came when i pulled updates before making a push.

But i have removed it now.

Copy link
Contributor

@adracea adracea left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey @propersam the dojo/unittests/test_dependency_check_parser.py seems to have also been removed by accident , not sure what happened there ? Also , this looks great but I was wondering if we should take the approach of the "eye svg" icon that you click to toggle instead of a checkbox ? @aaronweaver

@aaronweaver
Copy link
Contributor

Like the change as well but agree with @adracea on "eye svg"

@propersam
Copy link
Contributor Author

The form is auto generated by django. I could nt edit the input box for password to fix in the eye svg icon. But let me see if i cn change checkbox to d eye svg icon. In the same position where checkbox currently is.

@propersam
Copy link
Contributor Author

How abt now. @aaronweaver @adracea How do you see it. I can't use button for the toggle because buttons automatically submits the form. And I can't put the SVG eye icon inside the password input box because it is auto generated by django form. That's why I wrapped the toggle icon in a clickable div element.

@valentijnscholten
Copy link
Member

Your PR still has this file removed, which I don't think is intended? dojo/unittests/test_dependency_check_parser.py

@propersam
Copy link
Contributor Author

propersam commented Apr 27, 2019

@valentijnscholten

The file test_dependency_check_parser.py was intentionally removed by @aaronweaver

in this commit:
38d351e

@valentijnscholten
Copy link
Member

Even if it was intentional I don't think it should be part of this PR.

@propersam
Copy link
Contributor Author

propersam commented Apr 27, 2019

Oh. Well, i don't really know what to do now. I couldn't make a push until i pulled all updates from dev branch. And the above commit updates not made by me where pulled into my code before i was able to push my own update.

Please, What do you suggest i do to make the PR the way it should be. Because i don't know if git has the functionality to control what updates come in and which ones don't during a pull request without causing a merge incompatibility.

@valentijnscholten
Copy link
Member

Getting it right "the git way" may be a bit of challenge, can't see exactly what happened there. Can't find that commit anywhere else but in this PR.
Easiest fix would possibly be git revert 38d351e6388b12a5d1a3da3299e1c359bf0ba52b or recreate the file with contents from the dev branch: https://github.com/DefectDojo/django-DefectDojo/blob/dev/dojo/unittests/test_dependency_check_parser.py

@propersam
Copy link
Contributor Author

I have restored the file.
I hope @aaronweaver is okay with this for whatever reason it was deleted in the first place.

@valentijnscholten
Copy link
Member

Thanks, just needs a newline at the end of that file to make it flake8 compliant (and risk to the dev branch)

@aaronweaver
Copy link
Contributor

@valentijnscholten @adracea Are we ok with merging? Looks like all changes have been addressed.

@aaronweaver aaronweaver merged commit d7da413 into DefectDojo:dev May 6, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants