Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-23 08:11:00 +00:00
Code Issues Projects Releases Wiki Activity
8,171 Commits 1 Branch 67 Tags 50 MiB
8b52ea248e
Commit Graph

8171 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jesson Soto Ventura
94ca23b782 TLD and SLD are now highlighted using publicsuffix 
- Added time.time() as the default for the start time on fake requests
 2019-09-24 23:12:25 -04:00
Adam Hopkins
6ba39ede08
Update concepts-certificates.md 
Update to direct people to using Safari instead of another browser on iOS.
 2019-09-24 14:59:26 +03:00
Maximilian Hils
a08c22dcdd
Merge pull request #3631 from mhils/lint 
Fix CI
 2019-09-05 23:20:54 +02:00
Maximilian Hils
ddaf5a1f1b
Merge pull request #3627 from RamiBerm/patch-1 
Updated har_dump,py timings dictionary function
 2019-09-05 22:14:04 +02:00
Maximilian Hils
e97a804e89
make dict comprehension more readable 2019-09-05 22:13:49 +02:00
Maximilian Hils
ede2d1b243
Merge pull request #3630 from tsaaristo/encode-zstandard 
Add support for zstd Content-Encoding
 2019-09-05 22:09:51 +02:00
Maximilian Hils
e77f375186 lint 2019-09-05 22:08:21 +02:00
Maximilian Hils
ebfff8db76 lint 2019-09-05 21:36:44 +02:00
Tero Saaristo
dd3589ce34 encoding: add support for zstd (zstandard) 
Handles zstandard-compressed bodies labeled as zstd.
 2019-09-05 17:52:04 +03:00
RamiBerm
4ce5e1386c
Updated har_dump,py timings dictionary function 
the HAR file spec (http://www.softwareishard.com/blog/har-12-spec/#timings) states that timings that do not apply for a certain requests should be set to -1, this example may set -1000 as a timings value for certain requests.
This ends up producing invalid HAR files in many cases.

My proposed fix is to assign -1 into the dic and only multiply by 1000 for other values
 2019-09-03 17:19:50 +03:00
cs
0d042c6d8e fix duplicate error response 2019-08-09 14:19:10 +08:00
Tom Saleeba
f47608c85e
docs: correct command to install mitmproxy 2019-08-01 22:04:58 +09:30
Tom Saleeba
ba848e2040
docs: add instructions for transparent proxy on Linux for traffic originating from the mitmproxy host itself 2019-08-01 15:37:25 +09:30
king6cong
586f8d2044 fix pf.conf on macOS 2019-07-30 20:26:51 +08:00
Jesson Soto Ventura
8a2a7652e4 Edit URL now opens the external editor 2019-07-22 23:14:56 -04:00
Jesson Soto Ventura
df06c4da3b Fixed linting issues 2019-07-21 14:11:37 -04:00
Jesson Soto Ventura
2cc2fafd2e Added console_flowlist_layout option 
- default
 - list
 - table
 2019-07-21 12:59:23 -04:00
Jesson Soto Ventura
99dc1cc2f2 Merge branch 'tabular' of github.com:Jessonsotoventura/mitmproxy into tabular 2019-07-21 10:51:22 -04:00
Jesson Soto Ventura
ed05c4debf Merge branch 'tabular' of https://github.com/BkPHcgQL3V/mitmproxy into tabular 2019-07-21 10:49:27 -04:00
Jesson Soto Ventura
826e42f793 Added Color palettes for lowlight, lowdark, solarized light, and solarized dark 2019-07-21 10:47:08 -04:00
BkPHcgQL3V
998d150c1e Tabular list flow 2019-07-21 10:47:08 -04:00
Jesson Soto Ventura
9a159b439c Added Color palettes for lowlight, lowdark, solarized light, and solarized dark 2019-07-21 10:33:59 -04:00
Maximilian Hils
0b0b4ccba6
Merge pull request #3591 from mhils/misc 
fix addon deconstruction
 2019-07-19 00:40:15 +02:00
Maximilian Hils
9f69540d57 fix addon deconstruction 2019-07-18 17:54:33 +02:00
Maximilian Hils
4bebd3a1bc
Merge pull request #3587 from mhils/yaml-list 
fix sequence option declaration in yaml files
 2019-07-18 03:15:08 +02:00
Maximilian Hils
a0e19336a2
remove unused dependency 2019-07-18 03:14:46 +02:00
Maximilian Hils
256c0c94fb
Merge pull request #3586 from mhils/issue-py38compat 
fix py38 compat
 2019-07-18 03:13:50 +02:00
Maximilian Hils
2236b52816 fix sequence option declaration in yaml files 2019-07-18 02:54:43 +02:00
Maximilian Hils
b86cf6dea9 fix py38 compat 2019-07-18 02:52:24 +02:00
Maximilian Hils
2e30c4073d
Merge pull request #3516 from pierlon/remove-confdir-argument 
Remove the confdir argument
 2019-07-17 23:59:40 +02:00
Maximilian Hils
d64ec3072d
Merge pull request #3542 from ZHRhodes/patch-1 
Typo in howto-wireshark-tls.md
 2019-07-17 22:49:37 +02:00
Maximilian Hils
5bcbbf9aeb
Merge pull request #3547 from felixonmars/brotli 
Use Brotli instead of brotlipy
 2019-07-17 22:49:08 +02:00
Maximilian Hils
3eebfed79f
Update serverplayback.py 2019-07-17 22:46:39 +02:00
Maximilian Hils
69a3f77256
Merge pull request #3525 from tonyb486/bugfix-dateheader 
Fix #3502 by using email.utils.formatdate's usegmt argument.
 2019-07-17 22:43:14 +02:00
Maximilian Hils
386772f8fc
Merge pull request #3580 from MathieuBordere/mathieu/3567-ReplaceMasker 
websockets: replace masker with more optimized one
 2019-07-17 22:38:49 +02:00
Maximilian Hils
0e096137d5 update pyinstaller 2019-07-17 22:24:38 +02:00
Mathieu Borderé
102e64bda5 websockets: replace masker with more optimized one 2019-07-06 14:51:40 +02:00
Thomas Kriechbaumer
b5404f82da
Merge pull request #3570 from luciopaiva/patch-1 
Doc fix regarding transparent proxy on macOS
 2019-07-03 20:45:29 +02:00
Lucio Paiva
a4f8457dd3
Minor fix re. macOS steps 2019-06-26 18:39:23 +01:00
Javier Tejero
e63a099fcc
Add refresh option to disable cookies 2019-06-05 14:27:06 +02:00
Felix Yan
2fef56767b
Use Brotli instead of brotlipy 
brotlipy is stuck at brotli 0.6 and upstream is inactive. Let's switch
to the official binding which is up-to-date and has same interfaces.
 2019-05-27 16:10:18 +08:00
ZHRhodes
1410bdd9ca
Update howto-wireshark-tls.md 
Fixed a typo in describing the master keys
 2019-05-16 23:21:47 -07:00
Pierre Gordon
bcbf76a628 Only handle types "allow", "ignore" & "tcp" 2019-04-19 13:43:12 -05:00
Pierre Gordon
1b3f86e709 Verify ignore_hosts & allow_hosts are mutually exclusive 2019-04-19 13:10:39 -05:00
Pierre Gordon
8d0c800d15 Add --allow_hosts option 
Closes #3295
 2019-04-19 12:39:53 -05:00
Anthony Biondo
a8489466c1 update formatdate for cookies and tests to use GMT formatting 2019-04-16 22:11:27 -04:00
Anthony Biondo
bcd1bb23f6 Fix #3502 by using email.utils.formatdate's usegmt argument. 2019-04-16 21:53:31 -04:00
peter-way
141ade5ae1 Use 'host_header' instead of 'host', when calculating 'HTTPRequest' hash in transparent mode. 2019-04-15 08:43:52 +08:00
Pierre Gordon
13ad81eaff Remove the confdir argument 
Closes #3266
 2019-04-09 15:23:07 -05:00
Maximilian Hils
8353f4a55a
Merge pull request #3480 from lusceu/master 
Updated exif kaitai files
 2019-04-02 16:39:16 +02:00