bubblev
/
bubble
9
0
Форк 0
Код Проблеми 0 Запити на злиття 0 Релізи 130 Вікі Активність
Мітки Етап
Новий запит на злиття

#58 Add request protector app with cross-domain cookies filtering

Злито
jonathan злито 35 комітів з kris/request_protector_app до master 4 роки тому
Обговорення 4 Коміти 35 Змінені файли 17
kris прокоментував(ла) 4 роки тому

@jonathan please review

Waiting on Jenkins build: https://jenkins.bubblev.org/job/bubble-dev-kris/252/
but not sure how it will go as current master build is failing.

@jonathan please review Waiting on Jenkins build: https://jenkins.bubblev.org/job/bubble-dev-kris/252/ but not sure how it will go as current master build is failing.
jonathan був призначений kris 4 роки тому
jonathan прокоментував(ла) 4 роки тому
Власник

Looks good, but what would the regex be if the intent is “delete any cookies NOT belonging to the current domain, or one of its subdomains”?

It seems like we would need some more logic -- if we add these 2 things I think it would work:

  1. The regex can include {{fqdn}} which will be replaced (in mitm-land) with the (regex-escaped) FQDN for the current request
  2. In addition to regex and replacement, add mode which can be match or no_match. Or, alternatively, see if the “regex negation” syntax works in Python’s regex implementation, see: https://stackoverflow.com/questions/2637675/how-to-negate-the-whole-regex ). If regex negation works, that may be easier.

Thoughts?

Looks good, but what would the regex be if the intent is "delete any cookies NOT belonging to the current domain, or one of its subdomains"? It seems like we would need some more logic -- if we add these 2 things I think it would work: 1. The regex can include `{{fqdn}}` which will be replaced (in mitm-land) with the (regex-escaped) FQDN for the current request 2. In addition to `regex` and `replacement`, add `mode` which can be `match` or `no_match`. Or, alternatively, see if the "regex negation" syntax works in Python's regex implementation, see: https://stackoverflow.com/questions/2637675/how-to-negate-the-whole-regex ). If regex negation works, that may be easier. Thoughts?
kris прокоментував(ла) 4 роки тому
Автор
  1. will do. Separate PR? (easier review)
  2. (?!...) is supported in python3’s re
1. will do. Separate PR? (easier review) 2. `(?!...)` is supported in python3's `re`
jonathan прокоментував(ла) 4 роки тому
Власник
  1. will do. Separate PR? (easier review)

No, let’s do it in this one. And test it :) this will be very cool when it works!

  1. (?!...) is supported in python3’s re

That’s good news. Let’s do that.

> 1. will do. Separate PR? (easier review) No, let's do it in this one. And test it :) this will be very cool when it works! > 2. `(?!...)` is supported in python3's `re` That's good news. Let's do that.
👍 1
kris змінився заголовок з Add request protector app with cross-domain cookies filtering на WIP: (testing after fqdn part) Add request protector app with cross-domain cookies filtering 4 роки тому
kris змінився заголовок з WIP: (testing after fqdn part) Add request protector app with cross-domain cookies filtering на Add request protector app with cross-domain cookies filtering 4 роки тому
kris змінився заголовок з Add request protector app with cross-domain cookies filtering на WIP: (waiting on fresh Jenkins build) Add request protector app with cross-domain cookies filtering 4 роки тому
kris змінився заголовок з WIP: (waiting on fresh Jenkins build) Add request protector app with cross-domain cookies filtering на Add request protector app with cross-domain cookies filtering 4 роки тому
kris прокоментував(ла) 4 роки тому
Автор

Passing Jenkins build: https://jenkins.bubblev.org/job/bubble-dev-kris/260/

Passing Jenkins build: https://jenkins.bubblev.org/job/bubble-dev-kris/260/
jonathan зробив запит змін 4 роки тому
jonathan left a comment

minor changes requested.

bubble-server/src/main/resources/models/defaults/bubblePlan.json
@@ -38,2 +38,3 @@
{"app": "UserBlocker"},
{"app": "TlsPassthru"}
{"app": "TlsPassthru"},
{"app": "RequestProtector"}
jonathan прокоментував(ла) 4 роки тому

Let’s add RequestProtector app to all plans.

Let's add `RequestProtector` app to all plans.
bubble-server/src/main/resources/packer/roles/mitmproxy/files/bubble_api.py
@@ -452,0 +487,4 @@

def _replace_in_headers(headers: nheaders.Headers, modifiers_dict: dict) -> int:
"""
Taken from original mitmproxy's Header class implementation with sligh change to allow replacement with empty string
jonathan прокоментував(ла) 4 роки тому

r/sligh/slight/

`r/sligh/slight/`
kris прокоментував(ла) 4 роки тому

Actully, I’ll remove this second part completely as I did a larger changes here recently

Actully, I'll remove this second part completely as I did a larger changes here recently
jonathan згадано цю проблему в коміті 4 роки тому
Add request protector app with cross-domain cookies filtering (#58) Add RequestProtector app to cheapest plan Update comment with typo Merge branch 'master' into kris/request_protector_app Merge branch 'master' into kris/request_protector_app Merge branch 'kris/request_protector_app' of git.bubblev.org:bubblev/bubble into kris/request_protector_app Extract method for updating requests host and port Fix header replacement Replace all cross-domain cookies with empty Add fqdn variable support in header replacements Merge branch 'master' into kris/request_protector_app Merge branch 'master' into kris/request_protector_app Merge branch 'master' into kris/request_protector_app Merge branch 'master' into kris/request_protector_app Add add header replacement button label Try to add initial header replacement for cross-domain cookies Merge branch 'master' into kris/request_protector_app Merge branch 'master' into kris/request_protector_app use special header replacement to skip emptied headers Set RequestProtector replacement optional again Fix replacement reference in RequestProtector app Update flex domains with empty set if needed Add back request heades modifiers as prime app Extract and refactor _primeApp method Merge branch 'master' into kris/request_protector_app # Conflicts - WIP: # bubble-server/src/main/java/bubble/service/stream/StandardAppPrimerService.java Use HeaderReplacement's id field in JSONs Make RequestProtector's replacement field required Add new app to some plans Set new app to have `app` presentation Add RuleDriver and AppMatcher for the new app Add request protector app Remove not used filter Merge branch 'master' into kris/request_protector_app Add full support for response header modification Merge branch 'master' into kris/request_protector_app # Conflicts: # utils/cobbzilla-utils Add RequestProtector app Co-authored-by: jonathan <jonathan@noreply.git.bubblev.org> Co-authored-by: Kristijan Mitrovic <kmitrovic@itekako.com> Reviewed-on: https://git.bubblev.org/bubblev/bubble/pulls/58
jonathan closed this pull request 4 роки тому
jonathan видалена гілка kris/request_protector_app 4 роки тому

Рецензенти

jonathan зробив запит змін 4 роки тому
Запит на злиття був влитиий як 237e90d126.
Підпишіться щоб приєднатися до обговорення.
Рецензенти
Request review
No reviewers
 jonathan
Мітки
Apply labels
Очистити мітки
No items
Без мітки
Етап
Set milestone
Очистити етап
No items
Етап відсутній
Виконавеці
Assign users
Прибрати виконавеців
Немає виконавеця
 jonathan
2 учасників
Сповіщення
Дата завершення

Термін виконання не встановлений.

Залежності

Цей запит на злиття в даний час не має залежностей.

Писати Попередній перегляд
Завантаження…
Відмінити
Зберегти
Тут ще немає жодного змісту.
Видалити гілку 'kris/request_protector_app'

Видалення гілки НЕЗВОРОТНЕ. Дію не можна скасувати. Продовжити?

Ні
Так