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.

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

Multi-Cookie Logic #285

Merged
merged 14 commits into from Nov 30, 2019
Merged

Multi-Cookie Logic #285

merged 14 commits into from Nov 30, 2019

Conversation

@rborden-appsec
Copy link

rborden-appsec commented Oct 15, 2019

At line 71:

Added logic which check for multiple cookies supplied in the cookie flag. Separation is performed on the semi-colon character. I apologize if I did this wrong.

Original code:

if cookie is not None and len(cookie) > 0:
    if "=" in cookie:
        name = cookie.split("=", 1)[0]
        val = cookie.split("=", 1)[1]
        c = requests.cookies.create_cookie(name=name, value=val)

        _requester.cookies.set_cookie(c)
    else:
        output.error(
            f"Invalid cookie specified ({cookie}) - cookie must be in NAME=VALUE format. Ignored."
        )
adamcaudill and others added 14 commits Aug 25, 2019
develop -> master
develop -> master
develop -> master
Update pythonpackage.yml
Update changelog
develop -> master
develop -> master
Split on first occurrence
Create 2019-09-04-yawast-0-9-released.md
develop -> master
Use pipx to install
develop -> master
Check for .DS_Store Files
At line 71:

Added logic which check for multiple cookies supplied in the cookie flag. Separation is performed on the semi-colon character. I apologize if I did this wrong.

Original code:

    if cookie is not None and len(cookie) > 0:
        if "=" in cookie:
            name = cookie.split("=", 1)[0]
            val = cookie.split("=", 1)[1]
            c = requests.cookies.create_cookie(name=name, value=val)

            _requester.cookies.set_cookie(c)
        else:
            output.error(
                f"Invalid cookie specified ({cookie}) - cookie must be in NAME=VALUE format. Ignored."
            )
@restyled-io restyled-io bot mentioned this pull request Oct 15, 2019
@restyled-io

This comment has been minimized.

Copy link

restyled-io bot commented Oct 15, 2019

Hey there-

I'm a bot, here to let you know that some code in this PR might not
match the team's automated styling. I ran the team's auto-reformatting tools on
the files changed in this PR and found some differences. Those differences can
be seen in #286.

Please see that Pull Request's description for more details.

@adamcaudill

This comment has been minimized.

Copy link
Owner

adamcaudill commented Oct 15, 2019

Replaced by #286

@adamcaudill

This comment has been minimized.

Copy link
Owner

adamcaudill commented Oct 15, 2019

Actually, no, need to use this one. Will close the other one.

@adamcaudill adamcaudill reopened this Oct 15, 2019
@adamcaudill adamcaudill changed the base branch from master to develop Oct 15, 2019
yawast/shared/network.py Show resolved Hide resolved
yawast/shared/network.py Show resolved Hide resolved
yawast/shared/network.py Show resolved Hide resolved
@adamcaudill adamcaudill self-assigned this Oct 15, 2019
@adamcaudill adamcaudill changed the base branch from develop to pr285-working Nov 30, 2019
@adamcaudill adamcaudill merged commit bd020e8 into adamcaudill:pr285-working Nov 30, 2019
3 of 4 checks passed
3 of 4 checks passed
restyled Restyling found differences
Details
CodeFactor 3 issues fixed.
Details
LGTM analysis: Python No new or fixed alerts
Details
WIP Ready for review
Details
adamcaudill added a commit that referenced this pull request Nov 30, 2019
* Bump validator-collection from 1.3.6 to 1.3.7

Bumps [validator-collection](https://github.com/insightindustry/validator-collection) from 1.3.6 to 1.3.7.
- [Release notes](https://github.com/insightindustry/validator-collection/releases)
- [Changelog](https://github.com/insightindustry/validator-collection/blob/master/CHANGES.rst)
- [Commits](insightindustry/validator-collection@v.1.3.6...v.1.3.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Update requirements.txt

* Bump packaging from 19.1 to 19.2

Bumps [packaging](https://github.com/pypa/packaging) from 19.1 to 19.2.
- [Release notes](https://github.com/pypa/packaging/releases)
- [Changelog](https://github.com/pypa/packaging/blob/master/CHANGELOG.rst)
- [Commits](pypa/packaging@19.1...19.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump urllib3 from 1.25.3 to 1.25.5

Bumps [urllib3](https://github.com/urllib3/urllib3) from 1.25.3 to 1.25.5.
- [Release notes](https://github.com/urllib3/urllib3/releases)
- [Changelog](https://github.com/urllib3/urllib3/blob/master/CHANGES.rst)
- [Commits](urllib3/urllib3@1.25.3...1.25.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump urllib3 from 1.25.5 to 1.25.6

Bumps [urllib3](https://github.com/urllib3/urllib3) from 1.25.5 to 1.25.6.
- [Release notes](https://github.com/urllib3/urllib3/releases)
- [Changelog](https://github.com/urllib3/urllib3/blob/master/CHANGES.rst)
- [Commits](urllib3/urllib3@1.25.5...1.25.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump mypy from 0.720 to 0.730

Bumps [mypy](https://github.com/python/mypy) from 0.720 to 0.730.
- [Release notes](https://github.com/python/mypy/releases)
- [Commits](python/mypy@v0.720...v0.730)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Multi-Cookie Logic

At line 71:

Added logic which check for multiple cookies supplied in the cookie flag. Separation is performed on the semi-colon character. I apologize if I did this wrong.

Original code:

    if cookie is not None and len(cookie) > 0:
        if "=" in cookie:
            name = cookie.split("=", 1)[0]
            val = cookie.split("=", 1)[1]
            c = requests.cookies.create_cookie(name=name, value=val)

            _requester.cookies.set_cookie(c)
        else:
            output.error(
                f"Invalid cookie specified ({cookie}) - cookie must be in NAME=VALUE format. Ignored."
            )

* Fix invalid responses to get IP address

Fixes #291

H/T @brandonlw

* Fix package building

* Update setup.py & Pipfile to fix build

* Fix macOS build

* Bump psutil from 5.6.6 to 5.6.7

Bumps [psutil](https://github.com/giampaolo/psutil) from 5.6.6 to 5.6.7.
- [Release notes](https://github.com/giampaolo/psutil/releases)
- [Changelog](https://github.com/giampaolo/psutil/blob/master/HISTORY.rst)
- [Commits](giampaolo/psutil@release-5.6.6...release-5.6.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Restyled by black

* Update to addres feedback

* Update docs and fix build

* Revert version change
adamcaudill added a commit that referenced this pull request Nov 30, 2019
* Merge #285 w/ CR Changes (#296)

* Bump validator-collection from 1.3.6 to 1.3.7

Bumps [validator-collection](https://github.com/insightindustry/validator-collection) from 1.3.6 to 1.3.7.
- [Release notes](https://github.com/insightindustry/validator-collection/releases)
- [Changelog](https://github.com/insightindustry/validator-collection/blob/master/CHANGES.rst)
- [Commits](insightindustry/validator-collection@v.1.3.6...v.1.3.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Update requirements.txt

* Bump packaging from 19.1 to 19.2

Bumps [packaging](https://github.com/pypa/packaging) from 19.1 to 19.2.
- [Release notes](https://github.com/pypa/packaging/releases)
- [Changelog](https://github.com/pypa/packaging/blob/master/CHANGELOG.rst)
- [Commits](pypa/packaging@19.1...19.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump urllib3 from 1.25.3 to 1.25.5

Bumps [urllib3](https://github.com/urllib3/urllib3) from 1.25.3 to 1.25.5.
- [Release notes](https://github.com/urllib3/urllib3/releases)
- [Changelog](https://github.com/urllib3/urllib3/blob/master/CHANGES.rst)
- [Commits](urllib3/urllib3@1.25.3...1.25.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump urllib3 from 1.25.5 to 1.25.6

Bumps [urllib3](https://github.com/urllib3/urllib3) from 1.25.5 to 1.25.6.
- [Release notes](https://github.com/urllib3/urllib3/releases)
- [Changelog](https://github.com/urllib3/urllib3/blob/master/CHANGES.rst)
- [Commits](urllib3/urllib3@1.25.5...1.25.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump mypy from 0.720 to 0.730

Bumps [mypy](https://github.com/python/mypy) from 0.720 to 0.730.
- [Release notes](https://github.com/python/mypy/releases)
- [Commits](python/mypy@v0.720...v0.730)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Multi-Cookie Logic

At line 71:

Added logic which check for multiple cookies supplied in the cookie flag. Separation is performed on the semi-colon character. I apologize if I did this wrong.

Original code:

    if cookie is not None and len(cookie) > 0:
        if "=" in cookie:
            name = cookie.split("=", 1)[0]
            val = cookie.split("=", 1)[1]
            c = requests.cookies.create_cookie(name=name, value=val)

            _requester.cookies.set_cookie(c)
        else:
            output.error(
                f"Invalid cookie specified ({cookie}) - cookie must be in NAME=VALUE format. Ignored."
            )

* Fix invalid responses to get IP address

Fixes #291

H/T @brandonlw

* Fix package building

* Update setup.py & Pipfile to fix build

* Fix macOS build

* Bump psutil from 5.6.6 to 5.6.7

Bumps [psutil](https://github.com/giampaolo/psutil) from 5.6.6 to 5.6.7.
- [Release notes](https://github.com/giampaolo/psutil/releases)
- [Changelog](https://github.com/giampaolo/psutil/blob/master/HISTORY.rst)
- [Commits](giampaolo/psutil@release-5.6.6...release-5.6.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Restyled by black

* Update to addres feedback

* Update docs and fix build

* Revert version change

* Bump rubyzip from 1.2.3 to 2.0.0 in /docs

Bumps [rubyzip](https://github.com/rubyzip/rubyzip) from 1.2.3 to 2.0.0.
- [Release notes](https://github.com/rubyzip/rubyzip/releases)
- [Changelog](https://github.com/rubyzip/rubyzip/blob/master/Changelog.md)
- [Commits](rubyzip/rubyzip@v1.2.3...v2.0.0)

Signed-off-by: dependabot[bot] <support@github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.