Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

allow specifying https:// proxy #10411

Merged
merged 31 commits into from
Jul 27, 2021
Merged

allow specifying https:// proxy #10411

merged 31 commits into from
Jul 27, 2021

Commits on Jun 17, 2021

  1. allow specifying https:// proxy 

    Signed-off-by: Marcus Hoffmann <bubu@bubu1.eu>
    @Bubu
    Bubu committed Jun 17, 2021
    Configuration menu
    Copy the full SHA
    8529878 View commit details
    Browse the repository at this point in the history

  2. add back note about supported schemes

    @Bubu
    Bubu committed Jun 17, 2021
    Configuration menu
    Copy the full SHA
    c9cb0a8 View commit details
    Browse the repository at this point in the history

  3. isort

    @Bubu
    Bubu committed Jun 17, 2021
    Configuration menu
    Copy the full SHA
    f889cdf View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2021

  1. Add test for connections to https proxy

    @richvdh
    richvdh committed Jun 23, 2021
    Configuration menu
    Copy the full SHA
    9326de3 View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2021

  1. fix comment wrapping 

    Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
    @Bubu @richvdh
    Bubu and richvdh authored Jun 24, 2021
    Configuration menu
    Copy the full SHA
    ef657bf View commit details
    Browse the repository at this point in the history

  2. tls_options_factory isn't Optional

    @Bubu
    Bubu committed Jun 24, 2021
    Configuration menu
    Copy the full SHA
    76698d8 View commit details
    Browse the repository at this point in the history

  3. make proxy_parse tests a separate class

    @Bubu
    Bubu committed Jun 24, 2021
    Configuration menu
    Copy the full SHA
    bca0c04 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'https_proxy' of github.com:Bubu/synapse into rework_pro… 

    …xy_support
    @Bubu
    Bubu committed Jun 24, 2021
    Configuration menu
    Copy the full SHA
    728bbfb View commit details
    Browse the repository at this point in the history

  5. add comment about supported proxy protocols to proxyagent

    @Bubu
    Bubu committed Jun 24, 2021
    Configuration menu
    Copy the full SHA
    9275a29 View commit details
    Browse the repository at this point in the history

  6. fix scheme, username:password order confusion in comment

    @Bubu
    Bubu committed Jun 24, 2021
    Configuration menu
    Copy the full SHA
    59e6f5a View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2021

  1. Update synapse/http/proxyagent.py 

    Co-authored-by: Dirk Klimpel <5740567+dklimpel@users.noreply.github.com>
    @richvdh @dklimpel
    richvdh and dklimpel authored Jul 7, 2021
    Configuration menu
    Copy the full SHA
    35378a0 View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2021

  1. Merge remote-tracking branch 'synapse/develop' into https_proxy_new 

    Conflicts:
	tests/http/test_proxyagent.py
    @dklimpel
    dklimpel committed Jul 15, 2021
    Configuration menu
    Copy the full SHA
    d455b74 View commit details
    Browse the repository at this point in the history

  2. fix merge

    @dklimpel
    dklimpel committed Jul 15, 2021
    Configuration menu
    Copy the full SHA
    486d9ae View commit details
    Browse the repository at this point in the history

  3. add type hints to test

    @dklimpel
    dklimpel committed Jul 15, 2021
    Configuration menu
    Copy the full SHA
    faa93d3 View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2021

  1. add type hints

    @dklimpel
    dklimpel committed Jul 16, 2021
    Configuration menu
    Copy the full SHA
    7aba100 View commit details
    Browse the repository at this point in the history

  2. newsfile

    @dklimpel
    dklimpel committed Jul 16, 2021
    Configuration menu
    Copy the full SHA
    8ce213d View commit details
    Browse the repository at this point in the history

  3. parse_proxy use urllib return credentials

    @dklimpel
    dklimpel committed Jul 16, 2021
    Configuration menu
    Copy the full SHA
    62a98e7 View commit details
    Browse the repository at this point in the history

  4. remove parse_username_password

    @dklimpel
    dklimpel committed Jul 16, 2021
    Configuration menu
    Copy the full SHA
    df66024 View commit details
    Browse the repository at this point in the history

  5. update ProxyParserTests

    @dklimpel
    dklimpel committed Jul 16, 2021
    Configuration menu
    Copy the full SHA
    8fdfc41 View commit details
    Browse the repository at this point in the history

  6. lint

    @dklimpel
    dklimpel committed Jul 16, 2021
    Configuration menu
    Copy the full SHA
    1aaedaa View commit details
    Browse the repository at this point in the history

  7. fix imports in tests

    @dklimpel
    dklimpel committed Jul 16, 2021
    Configuration menu
    Copy the full SHA
    2ace68b View commit details
    Browse the repository at this point in the history

  8. 2nd fix imports in tests

    @dklimpel
    dklimpel committed Jul 16, 2021
    Configuration menu
    Copy the full SHA
    82b18d9 View commit details
    Browse the repository at this point in the history

  9. fix and add new tests

    @dklimpel
    dklimpel committed Jul 16, 2021
    Configuration menu
    Copy the full SHA
    3524c80 View commit details
    Browse the repository at this point in the history

  10. small typo in tests

    @dklimpel
    dklimpel committed Jul 16, 2021
    Configuration menu
    Copy the full SHA
    292bdf0 View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2021

  1. update f-strings

    @dklimpel
    dklimpel committed Jul 19, 2021
    Configuration menu
    Copy the full SHA
    9c205e1 View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2021

  1. Apply suggestions from code review 

    Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
    @dklimpel @richvdh
    dklimpel and richvdh authored Jul 20, 2021
    Configuration menu
    Copy the full SHA
    af0eb94 View commit details
    Browse the repository at this point in the history

  2. update after review

    @dklimpel
    dklimpel committed Jul 20, 2021
    Configuration menu
    Copy the full SHA
    047e3a2 View commit details
    Browse the repository at this point in the history

  3. update doc string

    @dklimpel
    dklimpel committed Jul 20, 2021
    Configuration menu
    Copy the full SHA
    584904f View commit details
    Browse the repository at this point in the history

  4. lint

    @dklimpel
    dklimpel committed Jul 20, 2021
    Configuration menu
    Copy the full SHA
    4176286 View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2021

  1. Fix up https proxy tests

    @richvdh
    richvdh committed Jul 27, 2021
    Configuration menu
    Copy the full SHA
    6da1b9a View commit details
    Browse the repository at this point in the history

  2. change from RuntimeError to ValueError

    @dklimpel
    dklimpel committed Jul 27, 2021
    Configuration menu
    Copy the full SHA
    b2a4928 View commit details
    Browse the repository at this point in the history