Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-30 03:14:22 +00:00
Code Issues Projects Releases Wiki Activity
6,492 Commits 1 Branch 67 Tags 50 MiB
7607240c30
Commit Graph

6492 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maximilian Hils
7607240c30 Merge pull request #2259 from mhils/2228 
fix #2228
 2017-04-26 12:10:39 +02:00
Maximilian Hils
df7701bb6d fix #2228 2017-04-26 11:32:24 +02:00
Maximilian Hils
07cb83597b clarify that --cert expects a leaf certificate 
refs #2254
 2017-04-26 11:18:27 +02:00
Aldo Cortesi
e32efcae49 Merge pull request #2262 from Kriechi/reduced-coverage++ 
improve tests (extracted from #2011)
 2017-04-26 19:52:33 +12:00
Aldo Cortesi
1daf0b3f0a Merge pull request #2264 from cortesi/options 
Change the way addons handle options
 2017-04-26 11:23:48 +12:00
Aldo Cortesi
b72f139093 configure(options, updated) -> configure(updated) 
Options are now available globally on ctx, so the first argument of configure
is redundant.
 2017-04-26 11:01:27 +12:00
Aldo Cortesi
f90b4c2ff0 Move options into ctx 
Many addons currently save options on configure(), either as individual options
or sometimes by saving the entire options object. The current options should
simply be available on the ctx object, simplifying state management for addons
considerably.
 2017-04-26 10:25:56 +12:00
Aldo Cortesi
02c82b1b60 Merge pull request #2261 from cortesi/addonrevamp 
Revamp how addons work
 2017-04-26 09:03:03 +12:00
Aldo Cortesi
7aa2081894 Remove watchdog, solidify script testing 
- Remove the watchdog dependency. We now just stat the script file every 2
seconds to check for an updated mtime.
- Further solidify our script testing, and in particular make the example tests
nicer. These should exemplify how we want users to test their own addon
scripts. More work on addon testing to follow.
 2017-04-26 09:01:40 +12:00
Thomas Kriechbaumer
a35a377cbb improve tests 2017-04-25 20:49:49 +02:00
Maximilian Hils
7ee0abbe0c Merge pull request #2219 from MatthewShao/jest-dev 
[web] Coverage++ for ducks/flows.js
 2017-04-25 20:26:45 +02:00
Matthew Shao
6962a2c3f2 Fix the tests for flows actions. 2017-04-25 19:29:52 +08:00
Matthew Shao
dcac976a47 Merge branch 'jest-dev' of https://github.com/MatthewShao/mitmproxy into jest-dev 2017-04-25 19:27:53 +08:00
Aldo Cortesi
e6eeab6094 Revamp how addons work 
- Addons now nest, which means that addons can manage addons. This has a number
of salutary effects - the scripts addon no longer has to poke into the global
addons list, we no longer have to replace/remove/boot-outof parent addons when
we load scripts, and this paves the way for making our top-level tools into
addons themselves.
- All addon calls are now wrapped in a safe execution environment where
exceptions are caught, and output to stdout/stderr are intercepted and turned
into logs.
- We no longer support script arguments in sys.argv - creating an option
properly is the only way to pass arguments. This means that all scripts are
always directly controllable from interctive tooling, and that arguments are
type-checked.

For now, I've disabled testing of the har dump example - it needs to be moved
to the new argument handling, and become a class addon. I'll address that in a
separate patch.
 2017-04-25 22:13:44 +12:00
Maximilian Hils
161cdff25e simplify selectRelative, add example for action testing 2017-04-24 15:13:45 +02:00
Matthew Shao
ae71ec1d30 [web] Coverage++ for ducks/flows.js 2017-04-24 14:18:12 +02:00
Thomas Kriechbaumer
90c425bd14 Merge pull request #2256 from ujjwal96/ip-formatting 
Fixed formatting in mitmdump
 2017-04-22 10:33:07 +02:00
Ujjwal Verma
73692b909b Fixed formatting in mitmdump 2017-04-22 11:24:22 +05:30
Maximilian Hils
6af72160bf [requires.io] dependency update on master branch (#2252) 2017-04-20 15:29:42 +02:00
Maximilian Hils
3d7cde058b [requires.io] dependency update on master branch (#2241) 2017-04-17 10:49:17 +02:00
Thomas Kriechbaumer
9c18f0ba09 Merge pull request #2240 from mitmproxy/requires-io-master 
[requires.io] dependency update on master branch
 2017-04-16 22:12:04 +02:00
Maximilian Hils
3aa7f24992 Update setup.py 2017-04-16 19:44:26 +02:00
requires.io
3afeb7c7e9 [requires.io] dependency update 2017-04-16 19:42:32 +02:00
Maximilian Hils
be5e276d45 Merge pull request #2239 from Kriechi/update-kaitai 
update kaitai and recompile formats
 2017-04-16 19:42:19 +02:00
Thomas Kriechbaumer
83a428e0b7 manually fix imports 2017-04-16 15:51:12 +02:00
Thomas Kriechbaumer
dadb50946e update kaitai and recompile formats 2017-04-16 15:51:11 +02:00
Maximilian Hils
ec6be96f2a Merge pull request #2234 from ujjwal96/ip-formatting 
Fixes IP address formatting #2109
 2017-04-10 20:24:15 +02:00
Ujjwal Verma
742127ef7b Fixes #2109 2017-04-09 18:55:20 +05:30
Maximilian Hils
c7b5012752 Merge pull request #2232 from r1b/master 
fixes ipv6 authority form parsing in CONNECT
 2017-04-09 01:15:50 +02:00
Robert C Jensen
7365f18542 fixes ipv6 authority form parsing in CONNECT 2017-04-07 15:46:21 -04:00
Maximilian Hils
c76620c19f Merge pull request #2227 from vinaydargar/grammarphrasing 
Replace phrase 'the the' in 2 places
 2017-04-04 02:26:10 +02:00
Vinay Dargar
55ba6ed14d Replace phrase 'the the' in 2 places 
Replaced with the appropriate "in the" and "to the".
There are multiple other occurences of this but they are in upstream python modules.
 2017-04-02 21:37:38 +05:30
Thomas Kriechbaumer
8567300dd6 Merge pull request #2224 from jonathanrfisher1/patch-1 
Replace phrase "an TLS" with "a TLS"
 2017-03-29 20:43:14 +02:00
jonathanrfisher1
677b9186ae Replace phrase "an TLS" with "a TLS" 
Updating usage of 'a' or 'an' to be more consistent with general English grammatical rules. TLS is pronounced with a consonant sound for both the expanded and abbreviated versions.
 2017-03-29 14:12:33 -04:00
Thomas Kriechbaumer
9e3edd16c2 Merge pull request #2223 from krsoninikhil/empty-logbuffer 
Add tests for set_focus
 2017-03-29 16:57:37 +02:00
Nikhil Soni
442999c75c Add tests for set_focus 2017-03-29 18:34:17 +05:30
Thomas Kriechbaumer
98957673f0 Merge pull request #2222 from BasThomas/patch-1 
Add syntax highlighting to Readme
 2017-03-29 13:53:06 +02:00
Bas Broek
dc37f7fd00 Add syntax highlighting to Readme 2017-03-29 13:36:51 +02:00
Thomas Kriechbaumer
034ca20d3c Merge pull request #2220 from krsoninikhil/empty-logbuffer 
eventlog: Override set_focus to check for index error
 2017-03-28 21:35:43 +02:00
Nikhil Soni
70a0f87570 Override set_focus to check for index error 2017-03-29 00:14:37 +05:30
Matthew Shao
15c19d2bc6 [web] Coverage++ for ducks/flows.js 2017-03-28 20:44:49 +08:00
Maximilian Hils
9c686ca14c Merge pull request #2212 from MatthewShao/jest-dev 
[web] Update Jest config and coverage ++
 2017-03-27 17:04:13 +02:00
Maximilian Hils
1909778e3d Merge pull request #2215 from mitmproxy/proxapp.local-1 
proxapp -> proxapp.local
 2017-03-26 16:09:26 +02:00
Matthew Shao
9a604b5cfe [web] Minor fixes for the test. 2017-03-26 21:58:47 +08:00
Matthew Shao
17ac1ff6cb [web] Exclude src/js/filt/filt.js from coverage report. 2017-03-26 21:38:00 +08:00
Maximilian Hils
482c1579f2 proxapp -> proxapp.local 
Chrome doesn't like it if there's no TLD.
 2017-03-26 15:02:47 +02:00
Matthew Shao
de9ecb7c30 [web] Add JS coverage to codecov. 2017-03-26 09:36:18 +08:00
Matthew Shao
31a45ddaaa [web] Reach 100% coverage for ducks/settings.js 2017-03-26 09:34:45 +08:00
Maximilian Hils
6f00c1bc5d Merge pull request #2213 from Kriechi/concurrent-coverage 
fix #2201
 2017-03-25 17:16:31 +01:00
Thomas Kriechbaumer
20776cf2fa fix #2201 2017-03-25 16:41:53 +01:00