diff options
| -rw-r--r-- | libmproxy/contrib/README | 1 | ||||
| -rw-r--r-- | libmproxy/contrib/windivert/CHANGELOG | 48 | ||||
| -rw-r--r-- | libmproxy/contrib/windivert/LICENSE | 787 | ||||
| -rw-r--r-- | libmproxy/contrib/windivert/README | 139 | ||||
| -rw-r--r-- | libmproxy/contrib/windivert/VERSION | 1 | ||||
| -rw-r--r-- | libmproxy/contrib/windivert/amd64/WinDivert.dll | bin | 0 -> 15360 bytes | |||
| -rw-r--r-- | libmproxy/contrib/windivert/amd64/WinDivert64.sys | bin | 0 -> 37936 bytes | |||
| -rw-r--r-- | libmproxy/contrib/windivert/x86/WinDivert.dll | bin | 0 -> 12800 bytes | |||
| -rw-r--r-- | libmproxy/contrib/windivert/x86/WinDivert32.sys | bin | 0 -> 31280 bytes | |||
| -rw-r--r-- | libmproxy/contrib/windivert/x86/WinDivert64.sys | bin | 0 -> 37936 bytes | |||
| -rw-r--r-- | libmproxy/platform/__init__.py | 12 | ||||
| -rw-r--r-- | libmproxy/platform/windows.py | 259 | ||||
| -rw-r--r-- | libmproxy/proxy/config.py | 2 | ||||
| -rw-r--r-- | requirements.txt | 3 |
14 files changed, 1248 insertions, 4 deletions
diff --git a/libmproxy/contrib/README b/libmproxy/contrib/README index 2506ad6d..7dc7c87d 100644 --- a/libmproxy/contrib/README +++ b/libmproxy/contrib/README @@ -13,3 +13,4 @@ html2text, git checkout 18/08/12, GPLv3 md5crypt, PSF license, http://code.activestate.com/recipes/325204/ +WinDivert 1.1.4, LGPL license, http://reqrypt.org/windivert.html
\ No newline at end of file diff --git a/libmproxy/contrib/windivert/CHANGELOG b/libmproxy/contrib/windivert/CHANGELOG new file mode 100644 index 00000000..29bcfef2 --- /dev/null +++ b/libmproxy/contrib/windivert/CHANGELOG @@ -0,0 +1,48 @@ +WinDivert 1.0.0 + - First release of WinDivert 1.0 +WinDivert 1.0.1 + - Fixed stack overflow bug in 32bit versions of the driver. +WinDivert 1.0.2 + - WinDivert now requires Administrator privileges in order to access + (as opposed to just install) the WinDivert device. +WinDivert 1.0.3 + - Fix bug(s) relating to the parsing of IPv6 addresses. + - DivertOpen() now returns more meaningful error codes on failure. + - Two new helper API functions: DivertHelperParseIPvXAddress(..), X=4,6. + - Renamed DivertHelperParse(..) to DivertHelperParsePacket(..). +WinDivert 1.0.4 + - Same as WinDivert 1.0.3 except: + * Released with signed drivers. + * MinGW compiled gcc-4.6 + * Minor documentation changes. +WinDivert 1.0.5 + - Fix the DIVERT_NETWORK_FORWARD_LAYER implementation. + - Upgrade Visual Studio support to 2012. +WinDivert 1.1.0-rc + - Re-brand "DIVERT" to "WINDIVERT" throughout the code-base. + - New flag: + * WINDIVERT_FLAG_NO_CHECKSUM: Do not guarantee that diverted packets + have a correct checksum. + - New default values and limits for various WinDivert parameters, + including WINDIVERT_PARAM_QUEUE_LEN, WINDIVERT_PARAM_QUEUE_TIME, and + the maximum filter length. + - New extended WinDivert functions that support asynchronous I/O: + * WinDivertRecvEx(..) + * WinDivertSendEx(..) + - The WinDivert driver now services reads (WinDivertRecv()) out-of-band. + - The WinDivert driver now protects packet data from modification by + other callout drivers and the user program. + - The WinDivert service is no longer created when the driver fails to + load. +WinDivert 1.1.1 + - Fixed a BSOD that sometimes occurs when the driver is unloaded. +WinDivert 1.1.2-rc + - Renamed drivers to "WinDivert32.sys" and "WinDivert64.sys". Both can + exist in the same directory, and WinDivert.dll automatically loads the + correct version. + - Deprecate both the WinDivert.inf and WdfCoInstaller*.dll files. +WinDivert 1.1.3 + - Fixed a bug causing outbound TCP packets to be sometimes lost. +WinDivert 1.1.4 + - Fixed a BSOD that occurs when NULL is passed as the address parameter to + WinDivertRecv(..) or WinDivertSend(..). diff --git a/libmproxy/contrib/windivert/LICENSE b/libmproxy/contrib/windivert/LICENSE new file mode 100644 index 00000000..811aa5e1 --- /dev/null +++ b/libmproxy/contrib/windivert/LICENSE @@ -0,0 +1,787 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. + +------------------------------------------------------------------------------ + + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. diff --git a/libmproxy/contrib/windivert/README b/libmproxy/contrib/windivert/README new file mode 100644 index 00000000..a1efb598 --- /dev/null +++ b/libmproxy/contrib/windivert/README @@ -0,0 +1,139 @@ +WinDivert 1.1: Windows Packet Divert +==================================== + +1. Introduction +--------------- + +Windows Packet Divert (WinDivert) is a user-mode packet capture-and-divert +package for Windows Vista, Windows 2008, Windows 7, and Windows 8. + +With WinDivert developers can write user-mode programs that capture and +modify or drop network packets sent to/from the Windows network stack. +In summary, WinDivert can + - capture network packets + - filter/drop network packets + - sniff network packets + - (re)inject network packets + - modify network packets + +WinDivert can be used to implement user-mode packet filters, packet sniffers, +firewalls, NAT, VPNs, tunneling applications, etc., etc.. If you +need to intercept and modify packets, then WinDivert is for you. + +The features of WinDivert include: + - packet interception, sniffing, or dropping modes + - support for loopback (localhost) traffic + - full IPv6 support + - network layer + - simple and powerful API + - high-level filtering language + - filter priorities + - freely available under the terms of the GNU Lesser General Public + License (LGPL) + +For more information about WinDivert, see doc/divert.html + +2. Similar Packages +------------------- + +WinDivert is similar to divert sockets in FreeBSD/MacOS, NETLINK sockets in +Linux, and some commercial packet capturing packages such as WinPkFilter for +Windows. The design of WinDivert is largely influenced by FreeBSD's divert +sockets. + +WinDivert in packet-sniffing mode is similar to Winpcap. Unlike Winpcap, +WinDivert fully supports capturing loopback traffic. Furthermore, WinDivert +supports packet interception, which is not supported in Winpcap. + +3. Architecture +--------------- + +The basic architecture of WinDivert is as follows: + + +-----------------+ + | | + +------->| PROGRAM |--------+ + | | (WinDivert.dll) | | + | +-----------------+ | + | | (3) re-injected + | (2a) matching packet | packet + | | + | | + [user mode] | | + ....................|...................................|................... + [kernel mode] | | + | | + | | + +---------------+ +-----------------> + (1) packet | | (2b) non-matching packet + ------------>| WinDivert.sys |--------------------------------------------> + | | + +---------------+ + +The WinDivert.sys driver is inserted below the Windows network stack. The +following then happens + +(1) a new packet enters the network stack and is intercepted by WinDivert.sys +(2a) if the packet matches a PROGRAM-defined filter, it is diverted. The + PROGRAM reads the packet with a call to the WinDivertRecv() function. +(2b) if the packet does not match the filter, the packet is permitted to + continue as normal. +(3) PROGRAM either drops, modifies, or re-injects the packet. If the + (modified) packet is re-injected, via a call to WinDivertSend(), it is + inserted back into the Windows network stack. + +4. Building +----------- + +(1) In a WinDDK build environment, run the command: + + wddk-build.bat + +(2) [OPTIONAL Visual Studio 2012 support] In a VS2012 command prompt, run the + command: + + msvc-build.bat + +(3) [OPTIONAL MinGW support] In Linux with MinGW a cross-compiler, run the + command: + + sh mingw-build.sh + +For more detailed build instructions, see doc\windivert.html + +5. License +---------- + +This package is distributed under the GNU Lesser General Public License +(LGPL) Version 3. See LICENSE for more information. + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Lesser General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public License +along with this program. If not, see <http://www.gnu.org/licenses/> + +6. About +-------- + +WinDivert was written by basil. + +For further information, or bug reports, please contact + + basil AT reqrypt DOT org + +The homepage for WinDivert is + + http://reqrypt.org/windivert.html + +The source code for WinDivert is hosted by GitHub at + + https://github.com/basil00/Divert + diff --git a/libmproxy/contrib/windivert/VERSION b/libmproxy/contrib/windivert/VERSION new file mode 100644 index 00000000..65087b4f --- /dev/null +++ b/libmproxy/contrib/windivert/VERSION @@ -0,0 +1 @@ +1.1.4 diff --git a/libmproxy/contrib/windivert/amd64/WinDivert.dll b/libmproxy/contrib/windivert/amd64/WinDivert.dll Binary files differnew file mode 100644 index 00000000..b461f500 --- /dev/null +++ b/libmproxy/contrib/windivert/amd64/WinDivert.dll diff --git a/libmproxy/contrib/windivert/amd64/WinDivert64.sys b/libmproxy/contrib/windivert/amd64/WinDivert64.sys Binary files differnew file mode 100644 index 00000000..3c46e764 --- /dev/null +++ b/libmproxy/contrib/windivert/amd64/WinDivert64.sys diff --git a/libmproxy/contrib/windivert/x86/WinDivert.dll b/libmproxy/contrib/windivert/x86/WinDivert.dll Binary files differnew file mode 100644 index 00000000..5b0a0f97 --- /dev/null +++ b/libmproxy/contrib/windivert/x86/WinDivert.dll diff --git a/libmproxy/contrib/windivert/x86/WinDivert32.sys b/libmproxy/contrib/windivert/x86/WinDivert32.sys Binary files differnew file mode 100644 index 00000000..71bec875 --- /dev/null +++ b/libmproxy/contrib/windivert/x86/WinDivert32.sys diff --git a/libmproxy/contrib/windivert/x86/WinDivert64.sys b/libmproxy/contrib/windivert/x86/WinDivert64.sys Binary files differnew file mode 100644 index 00000000..3c46e764 --- /dev/null +++ b/libmproxy/contrib/windivert/x86/WinDivert64.sys diff --git a/libmproxy/platform/__init__.py b/libmproxy/platform/__init__.py index 7f570133..b16904a7 100644 --- a/libmproxy/platform/__init__.py +++ b/libmproxy/platform/__init__.py @@ -1,12 +1,18 @@ import sys resolver = None +setup = None + if sys.platform == "linux2": - import linux + from . import linux resolver = linux.Resolver elif sys.platform == "darwin": - import osx + from . import osx resolver = osx.Resolver elif sys.platform == "freebsd10": - import osx + from . import osx resolver = osx.Resolver +elif sys.platform == "win32": + from . import windows + resolver = windows.Resolver + setup = windows.TransparentProxy.setup
\ No newline at end of file diff --git a/libmproxy/platform/windows.py b/libmproxy/platform/windows.py new file mode 100644 index 00000000..2734bffb --- /dev/null +++ b/libmproxy/platform/windows.py @@ -0,0 +1,259 @@ +import argparse +import cPickle as pickle +import os +import platform +import socket +import SocketServer +import threading +import time +from collections import OrderedDict + +from pydivert.windivert import WinDivert +from pydivert.enum import Direction, Layer, Flag + + +PROXY_API_PORT = 8085 + + +class Resolver(object): + + def __init__(self): + self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + self.socket.connect(("127.0.0.1", PROXY_API_PORT)) + + self.wfile = self.socket.makefile('wb') + self.rfile = self.socket.makefile('rb') + self.lock = threading.Lock() + + def original_addr(self, csock): + client = csock.getpeername()[:2] + with self.lock: + pickle.dump(client, self.wfile) + self.wfile.flush() + return pickle.load(self.rfile) + + +class APIRequestHandler(SocketServer.StreamRequestHandler): + """ + TransparentProxy API: Returns the pickled server address, port tuple + for each received pickled client address, port tuple. + """ + def handle(self): + proxifier = self.server.proxifier + while True: + # print("API connection") + client = pickle.load(self.rfile) + # print("Received API Request: %s" % str(client)) + server = proxifier.client_server_map[client] + pickle.dump(server, self.wfile) + self.wfile.flush() + # print("API request handled") + + +class APIServer(SocketServer.ThreadingMixIn, SocketServer.TCPServer): + pass + + +class TransparentProxy(object): + """ + Transparent Windows Proxy for mitmproxy based on WinDivert/PyDivert. + + Requires elevated (admin) privileges. Can be started separately by manually running the file. + + This module can be used to intercept and redirect all traffic that is forwarded by the user's machine. + This does NOT include traffic sent from the machine itself, which cannot be accomplished by this approach for + technical reasons (we cannot distinguish between requests made by the proxy or by regular applications. Altering the + destination the proxy is seeing to some meta address does not work with TLS as the address doesn't match the + signature.) + + How it works: + + (1) First, we intercept all packages that are forwarded by the OS (WinDivert's NETWORK_FORWARD layer) and whose + destination port matches our filter (80 and 443 by default). + For each intercepted package, we + 1. Store the source -> destination mapping (address and port) + 2. Remove the package from the network (by not reinjecting it). + 3. Re-inject the package into the local network stack, but with the destination address changed to the proxy. + + (2) Next, the proxy receives the forwarded packet, but does not know the real destination yet (which we overwrote + with the proxy's address). On Linux, we would now call getsockopt(SO_ORIGINAL_DST), but that unfortunately doesn't + work on Windows. However, we still have the correct source information. As a workaround, we now access the forward + module's API (see APIRequestHandler), submit the source information and get the actual destination back (which the + forward module stored in (1.3)). + + (3) The proxy now establish the upstream connection as usual. + + (4) Finally, the proxy sends the response back to the client. To make it work, we need to change the packet's source + address back to the original destination (using the mapping from (1.3)), to which the client believes he is talking + to. + """ + + def __init__(self, + redirect_ports=(80, 443), + proxy_addr=False, proxy_port=8080, + api_host="localhost", api_port=PROXY_API_PORT, + cache_size=65536): + """ + :param redirect_ports: if the destination port is in this tuple, the requests are redirected to the proxy. + :param proxy_addr: IP address of the proxy (IP within a network, 127.0.0.1 does not work). By default, + this is detected automatically. + :param proxy_port: Port the proxy is listenting on. + :param api_host: Host the forward module API is listening on. + :param api_port: Port the forward module API is listening on. + :param cache_size: Maximum number of connection tuples that are stored. Only relevant in very high + load scenarios. + """ + + if not proxy_addr: + # Auto-Detect local IP. + # https://stackoverflow.com/questions/166506/finding-local-ip-addresses-using-pythons-stdlib + s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) + s.connect(("8.8.8.8", 80)) + proxy_addr = s.getsockname()[0] + s.close() + + self.client_server_map = OrderedDict() + self.proxy_addr, self.proxy_port = proxy_addr, proxy_port + self.connection_cache_size = cache_size + + self.api_server = APIServer((api_host, api_port), APIRequestHandler) + self.api_server.proxifier = self + self.api_server_thread = threading.Thread(target=self.api_server.serve_forever) + self.api_server_thread.daemon = True + + arch = "amd64" if platform.architecture()[0] == "64bit" else "x86" + self.driver = WinDivert(os.path.join(os.path.dirname(__file__), "..", "contrib", + "windivert", arch, "WinDivert.dll")) + self.driver.register() + + filter_forward = " or ".join( + ("tcp.DstPort == %d" % p) for p in redirect_ports) + self.handle_forward = self.driver.open_handle(filter=filter_forward, layer=Layer.NETWORK_FORWARD) + self.forward_thread = threading.Thread(target=self.redirect) + self.forward_thread.daemon = True + + filter_local = "outbound and tcp.SrcPort == %d" % proxy_port + self.handle_local = self.driver.open_handle(filter=filter_local, layer=Layer.NETWORK) + self.local_thread = threading.Thread(target=self.adjust_source) + self.local_thread.daemon = True + + self.handle_icmp = self.driver.open_handle(filter="icmp", layer=Layer.NETWORK, flags=Flag.DROP) + + @classmethod + def setup(cls, options): + # TODO: Make sure that server can be killed cleanly. That's a bit difficult as we don't have access to + # controller.should_exit when this is called. + s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + server_unavailable = s.connect_ex(("127.0.0.1", PROXY_API_PORT)) + if server_unavailable: + proxifier = TransparentProxy(proxy_addr=options.addr, proxy_port=options.port) + proxifier.start() + + def start(self): + self.api_server_thread.start() + self.local_thread.start() + self.forward_thread.start() + + def shutdown(self): + self.handle_forward.close() + self.handle_local.close() + self.handle_icmp.close() + self.api_server.shutdown() + + def recv(self, handle): + """ + Convenience function that receives a packet from the passed handler and handles error codes. + If the process has been shut down, (None, None) is returned. + """ + try: + raw_packet, metadata = handle.recv() + return self.driver.parse_packet(raw_packet), metadata + except WindowsError, e: + if e.winerror == 995: + return None, None + else: + raise e + + def redirect(self): + """ + Redirect packages to the proxy + """ + while True: + packet, metadata = self.recv(self.handle_forward) + if not packet: + return + + # print(" * Redirect client -> server to proxy") + # print("%s:%s -> %s:%s" % (packet.src_addr, packet.src_port, packet.dst_addr, packet.dst_port)) + client = (packet.src_addr, packet.src_port) + server = (packet.dst_addr, packet.dst_port) + + if client in self.client_server_map: + del self.client_server_map[client] + while len(self.client_server_map) > self.connection_cache_size: + self.client_server_map.popitem(False) + + self.client_server_map[client] = server + + packet.dst_addr, packet.dst_port = self.proxy_addr, self.proxy_port + metadata.direction = Direction.INBOUND + + packet = self.driver.update_packet_checksums(packet) + self.handle_local.send((packet.raw, metadata)) + + def adjust_source(self): + """ + Spoof source address of packets send from the proxy to the client + """ + while True: + packet, metadata = self.recv(self.handle_local) + if not packet: + return + + # If the proxy responds to the client, let the client believe the target server sent the packets. + # print(" * Adjust proxy -> client") + client = (packet.dst_addr, packet.dst_port) + server = self.client_server_map[client] + packet.src_addr, packet.src_port = server + + packet = self.driver.update_packet_checksums(packet) + self.handle_local.send((packet.raw, metadata)) + + def icmp_block(self): + """ + Block all ICMP requests (which are sent on Windows by default). + In layman's terms: If we don't do this, our proxy machine tells the client that it can directly connect to the + real gateway if they are on the same network. + """ + while True: + packet, metadata = self.recv(self.handle_icmp) + if not packet: + return + # no nothing with the received packet, do not reinject it. + + +if __name__ == "__main__": + parser = argparse.ArgumentParser(description="Windows Transparent Proxy") + parser.add_argument("--redirect-ports", nargs="+", type=int, default=[80, 443], metavar="80", + help="ports that should be forwarded to the proxy") + parser.add_argument("--proxy-addr", default=False, + help="proxy server address") + parser.add_argument("--proxy-port", type=int, default=8080, + help="proxy server port") + parser.add_argument("--api-host", default="localhost", + help="API hostname to bind to") + parser.add_argument("--api-port", type=int, default=PROXY_API_PORT, + help="API port") + parser.add_argument("--cache-size", type=int, default=65536, + help="maximum connection cache size") + options = parser.parse_args() + proxifier = TransparentProxy(**vars(options)) + proxifier.start() + print(" * Transparent proxy active.") + try: + while True: + time.sleep(1) + except KeyboardInterrupt: + print(" * Shutting down...") + proxifier.shutdown() + print(" * Shut down.")
\ No newline at end of file diff --git a/libmproxy/proxy/config.py b/libmproxy/proxy/config.py index 94a12bf4..fac7c02a 100644 --- a/libmproxy/proxy/config.py +++ b/libmproxy/proxy/config.py @@ -41,6 +41,8 @@ def process_proxy_options(parser, options): c += 1 if not platform.resolver: return parser.error("Transparent mode not supported on this platform.") + if platform.setup: + platform.setup(options) get_upstream_server = TransparentUpstreamServerResolver(platform.resolver(), TRANSPARENT_SSL_PORTS) http_form_in, http_form_out = "relative", "relative" if options.reverse_proxy: diff --git a/requirements.txt b/requirements.txt index 8c03d364..11d74ad1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,4 +12,5 @@ requests>=1.2.2 urwid>=1.1.1 wsgiref>=0.1.2 jsbeautifier>=1.4.0 -cssutils>=1.0,<1.1
\ No newline at end of file +cssutils>=1.0,<1.1 +pydivert>=0.0.2
\ No newline at end of file |