Add --output-http-compatibility-mode

Add support for using default Go HTTP client

.gitignore

@@ -6,6 +6,7 @@
 *.bin
 
 *.gz
+*.zip
 
 *.class
 
@@ -15,3 +16,11 @@
 gor
 
 *.mprof
+
+*.pcap
+
+.DS_Store
+
+corpus
+crashers
+suppressions

.gitmodules

@@ -0,0 +1,15 @@
+[submodule "vendor/github.com/mattbaird/elastigo"]
+	path = vendor/github.com/mattbaird/elastigo
+	url = https://github.com/mattbaird/elastigo
+[submodule "vendor/github.com/araddon/gou"]
+	path = vendor/github.com/araddon/gou
+	url = https://github.com/araddon/gou
+[submodule "vendor/github.com/bitly/go-hostpool"]
+	path = vendor/github.com/bitly/go-hostpool
+	url = https://github.com/bitly/go-hostpool
+[submodule "vendor/github.com/bmizerany/assert"]
+	path = vendor/github.com/bmizerany/assert
+	url = https://github.com/bmizerany/assert
+[submodule "vendor/github.com/google/gopacket"]
+	path = vendor/github.com/google/gopacket
+	url = https://github.com/google/gopacket

.request

@@ -0,0 +1,5 @@
+POST /post HTTP/1.1
+Content-Length: 7
+Host: www.w3.org
+
+a=1&b=2

COMM-LICENSE

@@ -2,7 +2,7 @@ END-USER LICENSE AGREEMENT
 
 ------------------------------------------------------------------------------
 
-IMPORTANT: THIS SOFTWARE END-USER LICENSE AGREEMENT ("EULA") IS A LEGAL AGREEMENT (“Agreement”) BETWEEN YOU (THE CUSTOMER, EITHER AS AN INDIVIDUAL OR, IF PURCHASED OR OTHERWISE ACQUIRED BY OR FOR AN ENTITY, AS AN ENTITY) AND REPLAY SOFTWARE. READ IT CAREFULLY BEFORE COMPLETING THE INSTALLATION PROCESS AND USING GOR PRO AND RELATED SOFTWARE COMPONENTS (“SOFTWARE”). IT PROVIDES A LICENSE TO USE THE SOFTWARE AND CONTAINS WARRANTY INFORMATION AND LIABILITY DISCLAIMERS. BY INSTALLING AND USING THE SOFTWARE, YOU ARE CONFIRMING YOUR ACCEPTANCE OF THE SOFTWARE AND AGREEING TO BECOME BOUND BY THE TERMS OF THIS AGREEMENT.
+IMPORTANT: THIS SOFTWARE END-USER LICENSE AGREEMENT ("EULA") IS A LEGAL AGREEMENT (“Agreement”) BETWEEN YOU (THE CUSTOMER, EITHER AS AN INDIVIDUAL OR, IF PURCHASED OR OTHERWISE ACQUIRED BY OR FOR AN ENTITY, AS AN ENTITY) AND GoReplay LLC. READ IT CAREFULLY BEFORE COMPLETING THE INSTALLATION PROCESS AND USING GOREPLAY PRO AND RELATED SOFTWARE COMPONENTS (“SOFTWARE”). IT PROVIDES A LICENSE TO USE THE SOFTWARE AND CONTAINS WARRANTY INFORMATION AND LIABILITY DISCLAIMERS. BY INSTALLING AND USING THE SOFTWARE, YOU ARE CONFIRMING YOUR ACCEPTANCE OF THE SOFTWARE AND AGREEING TO BECOME BOUND BY THE TERMS OF THIS AGREEMENT.
 
 ------------------------------------------------------------------------------
 
@@ -12,21 +12,19 @@ In order to use the Software under this Agreement, you must receive a “Source
 
 1.1 General Use. This Agreement grants you a non-exclusive, non-transferable, limited license to the use rights for the Software, without the right to grant sublicenses, subject to the terms and conditions in this Agreement. The Software is licensed, not sold.
 
-1.2 Unlimited Organization License. If you purchased an Organization License (included with the Gor Pro Software), you may install the Software on an unlimited number of Hosts. “Host” means any physical or virtual machine which is controlled by you. You may also run an unlimited number of Workers. “Worker” means a thread within a Gor server process which executes jobs. You may concurrently run the software on an unlimited number of Hosts, with each host running an unlimited number of Workers.
+1.2 Unlimited Organization License. If you purchased an Organization License (included with the GoReplay Pro Software), you may install the Software on an unlimited number of Hosts. “Host” means any physical or virtual machine which is controlled by you. You may concurrently run the software on an unlimited number of Hosts.
 
-1.3 Limited Organization License. If you purchased an Organization License (included with the Gor Enterprise Software), you may install the Software on an unlimited number of Hosts. “Host” means any physical or virtual machine which is controlled by you. The aggregate number of Workers run by the hosts must not exceed the maximum number of Workers authorized at the time of purchase. “Worker” means a running Gor instance which intercept or replay traffic. In order to run additional Workers, you must purchase an additional allowance from Replay Software.
+1.3 Appliance License. If you purchased an Appliance License, you may distribute the Software in any applications, frameworks, or elements (collectively referred to as an “Application” or “Applications”) that you develop using the Software in accordance with this EULA, provided that such distribution does not violate the restrictions set forth in section 3 of this EULA. You must not remove, obscure or interfere with any copyright, acknowledgment, attribution, trademark, warning or disclaimer statement affixed to, incorporated in or otherwise applied in connection with the Software. You are required to ensure that the Software is not reused by or with any applications other than those with which you distribute it as permitted herein. For example, if You install the Software on a customer’s server, that customer is not permitted to use the Software independently of your Application. You must inform GoReplay LLC of your knowledge of any infringing use of the Software by any of your customers. You are liable for compliance by those third parties with the terms and conditions of this EULA. You will not owe GoReplay LLC any royalties for your distribution of the Software in accordance with this EULA.
 
-1.4 Appliance License. If you purchased an Appliance License, you may distribute the Software in any applications, frameworks, or elements (collectively referred to as an “Application” or “Applications”) that you develop using the Software in accordance with this EULA, provided that such distribution does not violate the restrictions set forth in section 3 of this EULA. You must not remove, obscure or interfere with any copyright, acknowledgment, attribution, trademark, warning or disclaimer statement affixed to, incorporated in or otherwise applied in connection with the Software. You are required to ensure that the Software is not reused by or with any applications other than those with which you distribute it as permitted herein. For example, if You install the Software on a customer’s server, that customer is not permitted to use the Software independently of your Application. You must inform Replay Software of your knowledge of any infringing use of the Software by any of your customers. You are liable for compliance by those third parties with the terms and conditions of this EULA. You will not owe Replay Software any royalties for your distribution of the Software in accordance with this EULA.
+1.4 Archive Copies. You are entitled to make a reasonable amount of copies of the Software for archival purposes. Each copy must reproduce all copyright and other proprietary rights notices on or in the Software Product.
 
-1.5 Archive Copies. You are entitled to make a reasonable amount of copies of the Software for archival purposes. Each copy must reproduce all copyright and other proprietary rights notices on or in the Software Product.
+1.5 Electronic Delivery. All Software and license documentation shall be delivered by electronic means unless otherwise specified on the applicable invoice or at the time of purchase. Software shall be deemed delivered when it is made available for download by you (“Delivery”).        
 
-1.6 Electronic Delivery. All Software and license documentation shall be delivered by electronic means unless otherwise specified on the applicable invoice or at the time of purchase. Software shall be deemed delivered when it is made available for download by you (“Delivery”).        
-
-2. Modifications. Replay Software shall provide you with source code so that you can create Modifications of the original software. “Modification” means: (a) any addition to or deletion from the contents of a file included in the original Software or previous Modifications created by You, or (b) any new file that contains any part of the original Software or previous Modifications. While you retain all rights to any original work authored by you as part of the Modifications, We continue to own all copyright and other intellectual property rights in the Software.
+2. Modifications. GoReplay LLC shall provide you with source code so that you can create Modifications of the original software. “Modification” means: (a) any addition to or deletion from the contents of a file included in the original Software or previous Modifications created by You, or (b) any new file that contains any part of the original Software or previous Modifications. While you retain all rights to any original work authored by you as part of the Modifications, We continue to own all copyright and other intellectual property rights in the Software.
 
 3. Restricted Uses. 
 
-3.1 You shall not (and shall not allow any third party to): (a) decompile, disassemble, or otherwise reverse engineer the Software or attempt to reconstruct or discover any source code, underlying ideas, algorithms, file formats or programming interfaces of the Software by any means whatsoever (except and only to the extent that applicable law prohibits or restricts reverse engineering restrictions); (b) distribute, sell, sublicense, rent, lease or use the Software for time sharing, hosting, service provider or like purposes, except as expressly permitted under this Agreement; (c) redistribute the Software or Modifications other than by including the Software or a portion thereof within your own product, which must have substantially different functionality than the Software or Modifications and must not allow any third party to use the Software or Modifications, or any portions thereof, for software development or application development purposes; (d) redistribute the Software as part of a product, "appliance" or "virtual server"; (e) redistribute the Software on any server which is not directly under your control; (f) remove any product identification, proprietary, copyright or other notices contained in the Software; (g) modify any part of the Software, create a derivative work of any part of the Software (except as permitted in Section 4), or incorporate the Software, except to the extent expressly authorized in writing by Replay Software; (h) publicly disseminate performance information or analysis (including, without limitation, benchmarks) from any source relating to the Software; (i) utilize any equipment, device, software, or other means designed to circumvent or remove any form of Source URL or copy protection used by Replay Software in connection with the Software, or use the Software together with any authorization code, Source URL, serial number, or other copy protection device not supplied by Replay Software; (j) use the Software to develop a product which is competitive with any Replay Software product offerings; or (k) use unauthorized Source URLS or keycode(s) or distribute or publish Source URLs or keycode(s), except as may be expressly permitted by Replay Software in writing. If your unique Source URL is ever published, Replay Software reserves the right to terminate your access without notice.
+3.1 You shall not (and shall not allow any third party to): (a) decompile, disassemble, or otherwise reverse engineer the Software or attempt to reconstruct or discover any source code, underlying ideas, algorithms, file formats or programming interfaces of the Software by any means whatsoever (except and only to the extent that applicable law prohibits or restricts reverse engineering restrictions); (b) distribute, sell, sublicense, rent, lease or use the Software for time sharing, hosting, service provider or like purposes, except as expressly permitted under this Agreement; (c) redistribute the Software or Modifications other than by including the Software or a portion thereof within your own product, which must have substantially different functionality than the Software or Modifications and must not allow any third party to use the Software or Modifications, or any portions thereof, for software development or application development purposes; (d) redistribute the Software as part of a product, "appliance" or "virtual server"; (e) redistribute the Software on any server which is not directly under your control; (f) remove any product identification, proprietary, copyright or other notices contained in the Software; (g) modify any part of the Software, create a derivative work of any part of the Software (except as permitted in Section 4), or incorporate the Software, except to the extent expressly authorized in writing by GoReplay LLC; (h) publicly disseminate performance information or analysis (including, without limitation, benchmarks) from any source relating to the Software; (i) utilize any equipment, device, software, or other means designed to circumvent or remove any form of Source URL or copy protection used by GoReplay LLC in connection with the Software, or use the Software together with any authorization code, Source URL, serial number, or other copy protection device not supplied by GoReplay LLC; (j) use the Software to develop a product which is competitive with any GoReplay LLC product offerings; or (k) use unauthorized Source URLS or keycode(s) or distribute or publish Source URLs or keycode(s), except as may be expressly permitted by GoReplay LLC in writing. If your unique Source URL is ever published, GoReplay LLC reserves the right to terminate your access without notice.
 
 3.2 UNDER NO CIRCUMSTANCES MAY YOU USE THE SOFTWARE AS PART OF A PRODUCT OR SERVICE THAT PROVIDES SIMILAR FUNCTIONALITY TO THE SOFTWARE ITSELF.
 
@@ -34,36 +32,37 @@ The Open Source version of the Software (“LGPL Version”) is licensed
 under the terms of the GNU Lesser General Public License versions 3.0
 (“LGPL”) and not under this EULA. 
 
-4. Ownership. Notwithstanding anything to the contrary contained herein, except for the limited license rights expressly provided herein, Replay Software and its suppliers have and will retain all rights, title and interest (including, without limitation, all patent, copyright, trademark, trade secret and other intellectual property rights) in and to the Software and all copies, modifications and derivative works thereof (including any changes which incorporate any of your ideas, feedback or suggestions). You acknowledge that you are obtaining only a limited license right to the Software, and that irrespective of any use of the words “purchase”, “sale” or like terms hereunder no ownership rights are being conveyed to you under this Agreement or otherwise. 
+4. Ownership. Notwithstanding anything to the contrary contained herein, except for the limited license rights expressly provided herein, GoReplay LLC and its suppliers have and will retain all rights, title and interest (including, without limitation, all patent, copyright, trademark, trade secret and other intellectual property rights) in and to the Software and all copies, modifications and derivative works thereof (including any changes which incorporate any of your ideas, feedback or suggestions). You acknowledge that you are obtaining only a limited license right to the Software, and that irrespective of any use of the words “purchase”, “sale” or like terms hereunder no ownership rights are being conveyed to you under this Agreement or otherwise. 
 
-5. Fees and Payment. The Software license fees will be due and payable in full as set forth in the applicable invoice or at the time of purchase. If the Software does not function properly within two weeks of purchase, please contact us within those two weeks for a refund. You shall be responsible for all taxes, withholdings, duties and levies arising from the order (excluding taxes based on the net income of Replay Software). 
+5. Fees and Payment. The Software license fees will be due and payable in full as set forth in the applicable invoice or at the time of purchase. If the Software does not function properly within two weeks of purchase, please contact us within those two weeks for a refund. You shall be responsible for all taxes, withholdings, duties and levies arising from the order (excluding taxes based on the net income of GoReplay LLC). 
 
-6. Support, Maintenance and Services. Subject to the terms and conditions of this Agreement, as set forth in your invoice, and as set forth on the Gor Pro support page (https://github.com/buger/gor/wiki/Pro-Support), support and maintenance services may be included with the purchase of your license subscription.
+6. Support, Maintenance and Services. Subject to the terms and conditions of this Agreement, as set forth in your invoice, and as set forth on the GoReplay Pro support page (https://github.com/buger/goreplay/wiki/Pro-Support), support and maintenance services may be included with the purchase of your license subscription.
 
 7. Term of Agreement. 
 
-7.1 Term. This Agreement is effective as of the Delivery of the Software and expires at such time as all license and service subscriptions hereunder have expired in accordance with their own terms (the “Term”). For clarification, the term of your license under this Agreement may be perpetual, limited for Evaluation Version, or designated as a fixed-term license in the Invoice, and shall be specified at your time of purchase. Either party may terminate this Agreement (including all related Invoices) if the other party: (a) fails to cure any material breach of this Agreement within thirty (30) days after written notice of such breach, provided that Replay Software may terminate this Agreement immediately upon any breach of Section 3 or if you exceed any other restrictions contained in Section 1, unless otherwise specified in this agreement; (b) ceases operation without a successor; or (c) seeks protection under any bankruptcy, receivership, trust deed, creditors arrangement, composition or comparable proceeding, or if any such proceeding is instituted against such party (and not dismissed within sixty (60) days)). Termination is not an exclusive remedy and the exercise by either party of any remedy under this Agreement will be without prejudice to any other remedies it may have under this Agreement, by law, or otherwise.        
+7.1 Term. This Agreement is effective as of the Delivery of the Software and expires at such time as all license and service subscriptions hereunder have expired in accordance with their own terms (the “Term”). For clarification, the term of your license under this Agreement may be perpetual, limited for Evaluation Version, or designated as a fixed-term license in the Invoice, and shall be specified at your time of purchase. Either party may terminate this Agreement (including all related Invoices) if the other party: (a) fails to cure any material breach of this Agreement within thirty (30) days after written notice of such breach, provided that GoReplay LLC may terminate this Agreement immediately upon any breach of Section 3 or if you exceed any other restrictions contained in Section 1, unless otherwise specified in this agreement; (b) ceases operation without a successor; or (c) seeks protection under any bankruptcy, receivership, trust deed, creditors arrangement, composition or comparable proceeding, or if any such proceeding is instituted against such party (and not dismissed within sixty (60) days)). Termination is not an exclusive remedy and the exercise by either party of any remedy under this Agreement will be without prejudice to any other remedies it may have under this Agreement, by law, or otherwise.        
 
 7.2 Termination. Upon any termination of this Agreement, you shall cease any and all use of any Software and destroy all copies thereof. 
 
-7.3 Expiration of License. Upon the expiration of any term under this Agreement, (a) all Software updates and services pursuant to the license shall cease, (b) you may only continue to run existing installations of the Software, (c) you may not install the Software on any additional Hosts, and (d) any new installation of the Software shall require the purchase of a new license subscription from Replay Software.
+7.3 Expiration of License. Upon the expiration of any term under this Agreement, (a) all Software updates and services pursuant to the license shall cease, (b) you may only continue to run existing installations of the Software, (c) you may not install the Software on any additional Hosts, and (d) any new installation of the Software shall require the purchase of a new license subscription from GoReplay LLC.
 
-8. Disclaimer of Warranties. The Software is provided "as is," with all faults, defects and errors, and without warranty of any kind. Replay Software does not warrant that the Software will be free of bugs, errors, viruses or other defects, and Replay Software shall have no liability of any kind for the use of or inability to use the Software, the Software content or any associated service, and you acknowledge that it is not technically practicable for Replay Software to do so. 
-To the maximum extent permitted by applicable law, Replay Software disclaims all warranties, express, implied, arising by law or otherwise, regarding the Software, the Software content and their respective performance or suitability for your intended use, including without limitation any implied warranty of merchantability, fitness for a particular purpose.
+8. Disclaimer of Warranties. The Software is provided "as is," with all faults, defects and errors, and without warranty of any kind. GoReplay LLC does not warrant that the Software will be free of bugs, errors, viruses or other defects, and GoReplay LLC shall have no liability of any kind for the use of or inability to use the Software, the Software content or any associated service, and you acknowledge that it is not technically practicable for GoReplay LLC to do so. 
+To the maximum extent permitted by applicable law, GoReplay LLC disclaims all warranties, express, implied, arising by law or otherwise, regarding the Software, the Software content and their respective performance or suitability for your intended use, including without limitation any implied warranty of merchantability, fitness for a particular purpose.
+Notwithstanding the foregoing, GoReplay LLC represents and warrants that it either owns the entire right to, title to, interest in, or has the right to license, the Software, and your proper use of the same will not violate any intellectual property or proprietary rights of another.
 
 9. Limitation of Liability. 
 
-In no event will Replay Software be liable for any direct, indirect, consequential, incidental, special, exemplary, or punitive damages or liabilities whatsoever arising from or relating to the Software, the Software content or this Agreement, whether based on contract, tort (including negligence), strict liability or other theory, even if Replay Software has been advised of the possibility of such damages.
+In no event will either party be liable for any direct, indirect, consequential, incidental, special, exemplary, or punitive damages or liabilities whatsoever arising from or relating to the Software, the Software content or this Agreement, whether based on contract, tort (including negligence), strict liability or other theory, even if such party has been advised of the possibility of such damages.
 
-In no event will Replay Software' liability exceed the Software license price as indicated in the invoice. The existence of more than one claim will not enlarge or extend this limit.
+In no event will GoReplay LLC liability exceed the Software license price as indicated in the invoice. The existence of more than one claim will not enlarge or extend this limit.
 
-10. Remedies. Your exclusive remedy and Replay Software’ entire liability for breach of this Agreement shall be limited, at Replay Software’ sole and exclusive discretion, to (a) replacement of any defective software or documentation; or (b) refund of the license fee paid to Replay Software, payable in accordance with Replay Software' refund policy.
+10. Remedies. Your exclusive remedy and GoReplay LLC’ entire liability for breach of this Agreement shall be limited, at GoReplay LLC’ sole and exclusive discretion, to (a) replacement of any defective software or documentation; or (b) refund of the license fee paid to GoReplay LLC, payable in accordance with GoReplay LLC' refund policy.
 
 11. Acknowledgements.
 
-11.1 Consent to the Use of Data. You agree that Replay Software and its affiliates may collect and use technical information gathered as part of the product support services. Replay Software may use this information solely to improve products and services and will not disclose this information in a form that personally identifies you.
+11.1 Consent to the Use of Data. You agree that GoReplay LLC and its affiliates may collect and use technical information gathered as part of the product support services to be used in an anonymized manner. GoReplay LLC may use this information solely to improve products and services and will not disclose this information in a form that personally identifies you.
 
-11.2 Verification. We or a certified auditor acting on our behalf, may, upon its reasonable request and at its expense, audit you with respect to the use of the Software. Such audit may be conducted by mail, electronic means or through an in-person visit to your place of business. Any such in-person audit shall be conducted during regular business hours at your facilities and shall not unreasonably interfere with your business activities. We shall not remove, copy, or redistribute any electronic material during the course of an audit. If an audit reveals that you are using the Software in a way that is in material violation of the terms of the EULA, then you shall pay our reasonable costs of conducting the audit. In the case of a material violation, you agree to pay Us any amounts owing that are attributable to the unauthorized use. In the alternative, We reserve the right, at our sole option, to terminate the licenses for the Software.
+11.2 Verification. We or a certified auditor acting on our behalf, may, upon its reasonable request and at its expense, audit you with respect to the use of the Software, subject to your reasonable information security and confidentiality protections. Such audit may be conducted by mail, electronic means or through an in-person visit to your place of business. Any such in-person audit shall be conducted during regular business hours at your facilities and shall not unreasonably interfere with your business activities. We shall not remove, copy, or redistribute any electronic material during the course of an audit. If an audit reveals that you are using the Software in a way that is in material violation of the terms of the EULA, then you shall pay our reasonable costs of conducting the audit. In the case of a material violation, you agree to pay Us any amounts owing that are attributable to the unauthorized use. In the alternative, We reserve the right, at our sole option, to terminate the licenses for the Software.
 
 11.3 Government End Users. If the Software and related documentation are supplied to or purchased by or on behalf of the United States Government, then the Software is deemed to be "commercial software" as that term is used in the Federal Acquisition Regulation system. Rights of the United States shall not exceed the minimum rights set forth in FAR 52.227-19 for "restricted computer software". All other terms and conditions of this Agreement apply.
 
@@ -74,13 +73,13 @@ In no event will Replay Software' liability exceed the Software license price as
 
 13.1 Entire Agreement. This Agreement sets forth our entire agreement with respect to the Software and the subject matter hereof and supersedes all prior and contemporaneous understandings and agreements whether written or oral.
 
-13.2 Amendment. Replay Software reserves the right, in its sole discretion, to amend this Agreement from time. Amendments to this Agreement can be located at: https://github.com/buger/gor/blob/master/COMM-LICENSE.
+13.2 Amendment. GoReplay LLC reserves the right, in its sole discretion, to amend this Agreement from time. Amendments to this Agreement can be located at: https://github.com/buger/goreplay/blob/master/COMM-LICENSE.
 
-13.3 Assignment. You may not assign this Agreement or any of its rights under this Agreement without the prior written consent of Replay Software and any attempted assignment without such consent shall be void.
+13.3 Assignment. You may not assign this Agreement or any of its rights under this Agreement without the prior written consent of GoReplay LLC and any attempted assignment without such consent shall be void.
 
-13.4 Export Compliance. You agree to comply with all applicable laws and regulations, including laws, regulations, orders or other restrictions on export, re-export or redistribution of software.
+13.4 Export Compliance. Each party agrees to comply with all applicable laws and regulations, including laws, regulations, orders or other restrictions on export, re-export or redistribution of software.
 
-13.5 Indemnification. You agree to defend, indemnify, and hold harmless Replay Software from and against any lawsuits, claims, losses, damages, fines and expenses (including attorneys' fees and costs) arising out of your use of the Software or breach of this Agreement.
+13.5 Indemnification. You agree to defend, indemnify, and hold harmless GoReplay LLC from and against any lawsuits, claims, losses, damages, fines and expenses (including attorneys' fees and costs) arising out of your use of the Software or breach of this Agreement.
 
 13.6 Governing Law. This Agreement is governed by the laws of the State of Oregon and the United States without regard to conflicts of laws provisions thereof, and without regard to the United Nations Convention on the International Sale of Goods or the Uniform Computer Information Transactions Act, as currently enacted by any jurisdiction or as may be codified or amended from time to time by any jurisdiction. The jurisdiction and venue for actions related to the subject matter hereof shall be the state of Oregon and United States federal courts located in Portland, Oregon, and both parties hereby submit to the personal jurisdiction of such courts. 
 
@@ -92,4 +91,4 @@ In no event will Replay Software' liability exceed the Software license price as
 
 13.10 Headings. The headings of sections and paragraphs of this Agreement are for convenience of reference only and are not intended to restrict, affect or be of any weight in the interpretation or construction of the provisions of such sections or paragraphs.
 
-14. Contact Information. If you have any questions about this EULA, or if you want to contact Replay Software for any reason, please direct correspondence to info@gortool.com
+14. Contact Information. If you have any questions about this EULA, or if you want to contact GoReplay LLC for any reason, please direct correspondence to info@gortool.com

Dockerfile

@@ -1,22 +1,8 @@
-FROM golang:latest
+FROM alpine:latest as builder
+RUN apk add --no-cache ca-certificates openssl
+RUN wget https://github.com/buger/goreplay/releases/download/v0.16.1/gor_0.16.1_x64.tar.gz -O gor.tar.gz
+RUN tar xzf gor.tar.gz
 
-RUN apt-get update && apt-get install ruby vim-common -y
-
-# Install Java for middleware testing
-RUN echo "deb http://ppa.launchpad.net/webupd8team/java/ubuntu trusty main" | tee /etc/apt/sources.list.d/webupd8team-java.list
-RUN echo "deb-src http://ppa.launchpad.net/webupd8team/java/ubuntu trusty main" | tee -a /etc/apt/sources.list.d/webupd8team-java.list
-RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys EEA14886
-RUN apt-get update -y
-RUN echo oracle-java7-installer shared/accepted-oracle-license-v1-1 select true | /usr/bin/debconf-set-selections
-RUN apt-get install oracle-java8-installer -y
-
-RUN apt-get install flex bison -y
-RUN wget http://www.tcpdump.org/release/libpcap-1.7.4.tar.gz && tar xzf libpcap-1.7.4.tar.gz && cd libpcap-1.7.4 && ./configure && make install
-RUN go get github.com/google/gopacket
-RUN go get -u github.com/golang/lint/golint
-
-WORKDIR /go/src/github.com/buger/gor/
-ADD . /go/src/github.com/buger/gor/
-
-RUN javac -cp /tmp/commons-io-2.4/commons-io-2.4.jar ./examples/middleware/echo.java
-RUN go get
+FROM scratch
+COPY --from=builder /goreplay .
+ENTRYPOINT ["./goreplay"]

Dockerfile.dev

@@ -0,0 +1,26 @@
+FROM golang:latest
+
+RUN apt-get update && apt-get install ruby vim-common -y
+
+# Install Java for middleware testing
+RUN echo "deb http://ppa.launchpad.net/webupd8team/java/ubuntu trusty main" | tee /etc/apt/sources.list.d/webupd8team-java.list
+RUN echo "deb-src http://ppa.launchpad.net/webupd8team/java/ubuntu trusty main" | tee -a /etc/apt/sources.list.d/webupd8team-java.list
+RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys EEA14886
+RUN apt-get update -y
+RUN echo oracle-java7-installer shared/accepted-oracle-license-v1-1 select true | /usr/bin/debconf-set-selections
+RUN apt-get install oracle-java8-installer -y
+
+RUN apt-get install flex bison -y
+RUN wget http://www.tcpdump.org/release/libpcap-1.8.1.tar.gz && tar xzf libpcap-1.8.1.tar.gz && cd libpcap-1.8.1 && ./configure && make install
+RUN go get github.com/google/gopacket
+RUN go get -u golang.org/x/lint/golint
+
+WORKDIR /go/src/github.com/buger/goreplay/
+
+RUN wget http://archive.apache.org/dist/commons/io/binaries/commons-io-2.4-bin.tar.gz && tar xzf commons-io-2.4-bin.tar.gz && cd commons-io-2.4 && mv commons-io-2.4.jar /tmp/
+RUN wget http://archive.apache.org/dist/commons/codec/binaries/commons-codec-1.9-bin.tar.gz && tar xzf commons-codec-1.9-bin.tar.gz
+
+ADD . /go/src/github.com/buger/goreplay/
+
+RUN javac -cp commons-io-2.4/commons-io-2.4.jar -cp commons-codec-1.9/commons-codec-1.9.jar ./examples/middleware/echo.java
+RUN go get

LICENSE.txt

@@ -1,7 +1,19 @@
-Gor is an Open Source project licensed under the terms of
+GoReplay is an Open Source project licensed under the terms of
 the LGPLv3 license.  Please see <http://www.gnu.org/licenses/lgpl-3.0.html>
 for license text.
 
-Gor Pro has a commercial-friendly license allowing private forks
-and modifications of Gor.  Please see http://gortool.com/#pro for
+As a special exception to the GNU Lesser General Public License version 3
+("LGPL3"), the copyright holders of this Library give you permission to
+convey to a third party a Combined Work that links statically or dynamically
+to this Library without providing any Minimal Corresponding Source or
+Minimal Application Code as set out in 4d or providing the installation
+information set out in section 4e, provided that you comply with the other
+provisions of LGPL3 and provided that you meet, for the Application the
+terms and conditions of the license(s) which apply to the Application.
+
+TLDR: You are free to use Gor subpackages like `byteutils` or `proto` in your commercial projects.
+
+
+GoReplay Pro has a commercial-friendly license allowing private forks
+and modifications of GoReplay.  Please see https://goreplay.org/pro.html for
 more detail.  You can find the commercial license terms in COMM-LICENSE.

Makefile

@@ -1,8 +1,8 @@
-SOURCE = emitter.go gor.go gor_stat.go input_dummy.go input_file.go input_raw.go input_tcp.go limiter.go output_dummy.go output_file.go input_http.go output_http.go output_tcp.go plugins.go settings.go test_input.go elasticsearch.go http_modifier.go http_modifier_settings.go http_client.go middleware.go protocol.go output_file_settings.go
-SOURCE_PATH = /go/src/github.com/buger/gor/
+SOURCE = $(shell ls -1 *.go | grep -v _test.go)
+SOURCE_PATH = /go/src/github.com/buger/goreplay/
 PORT = 8000
 FADDR = :8000
-RUN = docker run -v `pwd`:$(SOURCE_PATH) -p 0.0.0.0:$(PORT):$(PORT) -t -i gor
+RUN = docker run -v `pwd`:$(SOURCE_PATH) -p 0.0.0.0:$(PORT):$(PORT) -i -t gor
 BENCHMARK = BenchmarkRAWInput
 TEST = TestRawListenerBench
 VERSION = DEV-$(shell date +%s)
@@ -12,17 +12,23 @@ FADDR = ":8000"
 
 release: release-x64 release-mac
 
+release-bin:
+	docker run -v `pwd`:$(SOURCE_PATH) -t --env GOOS=linux --env GOARCH=amd64  -i gor go build -o gor -tags netgo $(LDFLAGS)
+
 release-x64:
-	docker run -v `pwd`:$(SOURCE_PATH) -t --env GOOS=linux --env GOARCH=amd64  -i gor go build $(LDFLAGS) && tar -czf gor_$(VERSION)_x64.tar.gz gor && rm gor
+	docker run -v `pwd`:$(SOURCE_PATH) -t --env GOOS=linux --env GOARCH=amd64  -i gor go build -o gor -tags netgo $(LDFLAGS) && tar -czf gor_$(VERSION)_x64.tar.gz gor && rm gor
 
 release-x86:
-	docker run -v `pwd`:$(SOURCE_PATH) -t --env GOOS=linux --env GOARCH=386 -i gor go build $(LDFLAGS) && tar -czf gor_$(VERSION)_x86.tar.gz gor && rm gor
+	docker run -v `pwd`:$(SOURCE_PATH) -t --env GOOS=linux --env GOARCH=386 -i gor go build -o gor -tags netgo $(LDFLAGS) && tar -czf gor_$(VERSION)_x86.tar.gz gor && rm gor
 
 release-mac:
-	go build $(MAC_LDFLAGS) && tar -czf gor_$(VERSION)_mac.tar.gz gor && rm gor
+	go build $(MAC_LDFLAGS) -o gor && tar -czf gor_$(VERSION)_mac.tar.gz gor && rm gor
+
+install:
+	go install $(MAC_LDFLAGS)
 
 build:
-	docker build -t gor .
+	docker build -t gor -f Dockerfile.dev .
 
 
 profile:
@@ -62,10 +68,10 @@ profile_test:
 
 # Used mainly for debugging, because docker container do not have access to parent machine ports
 run:
-	$(RUN) go run $(LDFLAGS) $(SOURCE) --input-dummy=0 --output-http="http://localhost:9000" --input-raw-track-response --input-raw 127.0.0.1:9000 --input-http 127.0.0.1:9000 --verbose --debug --middleware "./examples/middleware/echo.sh" --output-file requests.gor
+	$(RUN) go run $(LDFLAGS) $(SOURCE) --input-dummy=0 --output-http="http://localhost:9000" --input-raw-track-response --input-raw 127.0.0.1:9000 --verbose --debug --middleware "./examples/middleware/echo.sh" --output-file requests.gor
 
 run-2:
-	sudo -E go run $(SOURCE) --input-dummy="" --output-tcp localhost:27001 --verbose --debug
+	$(RUN) go run $(LDFLAGS) $(SOURCE) --input-raw :8000 --input-raw-bpf-filter "dst port 8000" --output-stdout --output-http "http://localhost:8000" --input-dummy=0
 
 run-3:
 	sudo -E go run $(SOURCE) --input-tcp :27001 --output-stdout
@@ -76,6 +82,9 @@ run-arg:
 file-server:
 	go run $(SOURCE) file-server $(FADDR)
 
+readpcap:
+	go run $(SOURCE) --input-raw $(FILE) --input-raw-track-response --input-raw-engine pcap_file --output-stdout
+
 record:
 	$(RUN) go run $(SOURCE) --input-dummy=0 --output-file=requests.gor --verbose --debug
 

README.md

@@ -1,49 +1,51 @@
-[![GitHub release](https://img.shields.io/github/release/buger/gor.svg?maxAge=3600)](https://github.com/buger/gor/releases) [![codebeat](https://codebeat.co/badges/6427d589-a78e-416c-a546-d299b4089893)](https://codebeat.co/projects/github-com-buger-gor) [![Go Report Card](https://goreportcard.com/badge/github.com/buger/gor)](https://goreportcard.com/report/github.com/buger/gor) [![Join the chat at https://gitter.im/buger/gor](https://badges.gitter.im/buger/gor.svg)](https://gitter.im/buger/gor?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![GitHub release](https://img.shields.io/github/release/buger/gor.svg?maxAge=3600)](https://github.com/buger/goreplay/releases) [![codebeat](https://codebeat.co/badges/6427d589-a78e-416c-a546-d299b4089893)](https://codebeat.co/projects/github-com-buger-gor) [![Go Report Card](https://goreportcard.com/badge/github.com/buger/gor)](https://goreportcard.com/report/github.com/buger/gor) [![Join the chat at https://gitter.im/buger/gor](https://badges.gitter.im/buger/gor.svg)](https://gitter.im/buger/gor?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Reviewed by Hound](https://img.shields.io/badge/Reviewed_by-Hound-8E64B0.svg)](https://houndci.com)
 
 ![Go Replay](http://i.imgur.com/ZG2ki5n.png)
 
+## https://goreplay.org/
+
+## We just released a new version, see announcement https://leonsbox.com/goreplay-v0-16-and-4th-anniversary-5408b1fd72e0
+
 ## About
 
-Gor is an open-source tool for capturing and replaying live HTTP traffic into a test environment in order to continuously test your system with real data. It can be used to increase confidence in code deployments, configuration changes and infrastructure changes.
+GoReplay is the simplest and safest way to test your app using real traffic before you put it into production.
+
+As your application grows, the effort required to test it also grows exponentially. GoReplay offers you the simple idea of reusing your existing traffic for testing, which makes it incredibly powerful. Our state of art technique allows you to analyze and record your application traffic without affecting it. This eliminates the risks that come with putting a third party component in the critical path. 
+
+GoReplay increases your confidence in code deployments, configuration changes and infrastructure changes. Did we mention that no coding is required?
+
 
-Now you can test your code on real user sessions in an automated and repeatable fashion.
-**No more falling down in production!**
 
 Here is basic workflow: The listener server catches http traffic and sends it to the replay server or saves to file. The replay server forwards traffic to a given address.
 
 ![Diagram](http://i.imgur.com/9mqj2SK.png)
 
+Check [latest documentation](http://github.com/buger/goreplay/wiki).
+
 ## Installation
-Download latest binary from https://github.com/buger/gor/releases or [compile by yourself](https://github.com/buger/gor/wiki/Compilation).
+Download latest binary from https://github.com/buger/goreplay/releases or [compile by yourself](https://github.com/buger/goreplay/wiki/Compilation).
 
 ## Getting started
 
 The most basic setup will be `sudo ./gor --input-raw :8000 --output-stdout` which acts like tcpdump.
 If you already have test environment you can start replaying: `sudo ./gor --input-raw :8000 --output-http http://staging.env`.
 
-See the our wiki and especially [Getting started](https://github.com/buger/gor/wiki/Getting-Started) wiki page for more info. 
+See the our [documentation](https://github.com/buger/goreplay/wiki/) and [Getting started](https://github.com/buger/goreplay/wiki/Getting-Started) page for more info. 
+## Newsletter
+Subscribe to our [newsletter](https://www.getdrip.com/forms/89690474/submissions/new) to stay informed about the latest features and changes to Gor project.
 
 
 ## Want to Upgrade?
 
-I also sell Gor Pro, extensions to Gor which provide more features, a commercial-friendly license and allow you to support high quality open source development all at the same time. Please see the Gor [homepage](https://gortool.com/) for more detail.
+We have created a [GoReplay PRO](https://goreplay.org/pro.html) extension which provides additional features such as support for binary protocols like Thrift or ProtocolBuffers, saving and replaying from cloud storage, TCP sessions replication, etc. The PRO version also includes a commercial-friendly license, dedicated support, and it also allows you to support high-quality open source development. 
 
-Subscribe to the [quarterly newsletter](https://tinyletter.com/gor) to stay informed about the latest features and changes to Gor and its bigger siblings.
 
 ## Problems?
-If you have a problem, please review the [FAQ](https://github.com/buger/gor/wiki/FAQ) and [Troubleshooting](https://github.com/buger/gor/wiki/Troubleshooting) wiki pages. Searching the [issues](https://github.com/buger/gor/issues) for your problem is also a good idea.
+If you have a problem, please review the [FAQ](https://github.com/buger/goreplay/wiki/FAQ) and [Troubleshooting](https://github.com/buger/goreplay/wiki/Troubleshooting) wiki pages. Searching the [issues](https://github.com/buger/goreplay/issues) for your problem is also a good idea.
 
-All bug-reports and suggestions should go though Github Issues or our [Google Group](https://groups.google.com/forum/#!forum/gor-users) (you can just send email to gor-users@googlegroups.com).
+All bug-reports and suggestions should go through Github Issues or our [Google Group](https://groups.google.com/forum/#!forum/gor-users) (you can just send email to gor-users@googlegroups.com).
 If you have a private question feel free to send email to support@gortool.com.
 
-Useful resources:
-
-* Product documentation is in the [wiki](http://github.com/buger/gor/wiki).
-* Release announcements are made to the [@buger](http://twitter.com/buger) Twitter account and our [newsleter](https://tinyletter.com/gor)
-
-
-If you need commercial support read more about Pro and Enterprise versions at our site [https://gortool.com/](https://gortool.com/)
-
 
 ## Contributing
 
@@ -66,7 +68,7 @@ If you need commercial support read more about Pro and Enterprise versions at ou
 * [Granify](http://granify.com) - AI backed SaaS solution that enables online retailers to maximise their sales
 * And many more!
 
-If you are using Gor we are happy add you to the list and share your story, just write to: hello@gortool.com
+If you are using Gor, we are happy to add you to the list and share your story, just write to: hello@goreplay.org
 
 ## Author
 

byteutils/byteutils.go

@@ -29,12 +29,15 @@ func Replace(a []byte, from, to int, new []byte) []byte {
 		copy(a[from:from+len(new)], new)
 
 		return a
-	} else if lenDiff < 0 {
+	}
+
+	if lenDiff < 0 {
 		copy(a[from:], new)
 		copy(a[from+len(new):], a[to:])
 		return a[:len(a)+lenDiff]
-	} else { // same size
-		copy(a[from:], new)
-		return a
 	}
+
+	// same size
+	copy(a[from:], new)
+	return a
 }

docs/CNAME

@@ -0,0 +1 @@
+docs.goreplay.org

docs/Capturing-and-replaying-traffic.md

@@ -0,0 +1,49 @@
+Think about Gor more like a network analyzer or tcpdump on steroids, it is not a proxy and does not affect your app anyhow. You specify application port, and it will capture and replay incoming data.
+
+Simplest setup will be:
+```bash
+# Run on servers where you want to catch traffic. You can run it on every `web` machine.
+sudo gor --input-raw :80 --output-http http://staging.com
+```
+It will record and replay traffic from the same machine. However, it is possible to use [[Aggregator-forwarder setup]], when Gor on your web machines forward traffic to Gor aggregator instance running on the separate server.
+
+> You may notice that it require `sudo`: to analyze network Gor need permissions which available only to root users. However, it is possible to configure Gor [beign run for non-root users](Running as a non-root user).
+
+
+### Forwarding to multiple addresses
+
+You can forward traffic to multiple endpoints.
+```
+gor --input-tcp :28020 --output-http "http://staging.com"  --output-http "http://dev.com"
+```
+
+### Splitting traffic
+By default, it will send same traffic to all outputs, but you have options to equally split it (round-robin) using  `--split-output` option.
+
+```
+gor --input-raw :80 --output-http "http://staging.com"  --output-http "http://dev.com" --split-output true
+```
+
+### Tracking responses
+By default `input-raw` does not intercept responses, only requests. You can turn response tracking using `--input-raw-track-response` option. When enable you will be able to access response information in middleware and `output-file`.
+
+
+### Traffic interception engine
+By default, Gor will use `libpcap` for intercepting traffic, it should work in most cases. If you have any troubles with it, you may try alternative engine: `raw_socket`.
+
+```
+sudo gor --input-raw :80 --input-raw-engine "raw_socket" --output-http "http://staging.com"
+```
+
+You can read more about [[Replaying HTTP traffic]].
+
+
+### Tracking original IP addresses
+You can use `--input-raw-realip-header` option to specify header name: If not blank, injects header with given name and real IP value to the request payload. Usually, this header should be named: `X-Real-IP`, but you can specify any name.
+
+`gor --input-raw :80 --input-raw-realip-header "X-Real-IP" ...`
+
+
+***
+
+Also you may want to know about [[Rate limiting]], [[Request rewriting]] and [[Request filtering]]

docs/Compilation.md

@@ -0,0 +1,30 @@
+We provide pre-compiled binaries for Mac and Linux, but you are free to compile Gor by yourself.
+
+Gor is written using Go, so first you need to download it from here https://golang.org/, use the latest stable version. 
+
+The only Gor dependency is [libpcap](https://github.com/the-tcpdump-group/libpcap), which is the interface to various kernel packet capture mechanisms, and https://github.com/google/gopacket, which is a Go wrapper around libpcap. Latest libpcap version can be obtained at http://www.tcpdump.org/release/. Libpcap itself depend on `flex` and `bison` packages, many operating systems already have them installed.
+
+```bash
+# Fetch libpcap dependencies. Depending on your OS, instead of `apt` you will use `yum` or `rpm`, or `brew` on Mac.
+sudo apt-get install flex bison -y
+
+# Download latest stable release, compile and install it
+wget http://www.tcpdump.org/release/libpcap-1.7.4.tar.gz && tar xzf libpcap-1.7.4.tar.gz
+cd libpcap-1.7.4
+./configure && make install
+
+
+# Lets fetch Gor source code
+mkdir $HOME/gocode
+# See more information about GOPATH https://github.com/golang/go/wiki/GOPATH
+export GOPATH=$HOME/gocode
+# Fetch code from the Github
+go get github.com/buger/gor
+
+# Compile from source
+cd $HOME/gocode/src/github.com/buger/gor
+go build LDFLAGS = -ldflags "-extldflags \"-static\""
+```
+
+After you finished, you should see `gor` binary in current directory. 
+

docs/Development-Setup.md

@@ -0,0 +1,39 @@
+## STEP 1: Install Docker
+For local development we recommend to use Docker.
+
+If you don’t have it you can read how to install it here:
+https://docs.docker.com/engine/getstarted/step_one/#step-3-verify-your-installation
+
+## STEP 2: Download repository
+
+`git clone git@github.com:buger/goreplay.git`
+
+
+## STEP 3: Setup container
+
+```
+cd ./goreplay
+make build
+
+```
+
+## Testing
+To run tests execute next command:
+
+```
+make test
+```
+
+You can copy the command that is produced and modify it. For example, if you need to run one test copy the command and add `-run TestName`, e.g.:
+
+```
+docker run -v `pwd`:/go/src/github.com/buger/gor/ -p 0.0.0.0:8000:8000 -t -i gor:go go test ./. -run TestEmitterFiltered -timeout 60s -ldflags "-X main.VERSION=DEV-1482398347 -extldflags \"-static\""   -v
+```
+
+
+## Building
+To get a binary file run 
+
+```
+make release-bin
+```

docs/Distributed-configuration.md

@@ -0,0 +1,26 @@
+Sometimes it makes sense to use separate Gor instance for replaying traffic and performing things like load testing, so your production machines do not spend precious resources. It is possible to configure Gor on your web machines forward traffic to Gor aggregator instance running on the separate server.
+
+```bash
+# Run on servers where you want to catch traffic. You can run it on each `web` machine.
+sudo gor --input-raw :80 --output-tcp replay.local:28020
+
+# Replay server (replay.local).
+gor --input-tcp replay.local:28020 --output-http http://staging.com
+```
+
+If you have multiple replay machines you can split traffic among them using `--split-output` option: it will equally split all incoming traffic to all outputs using round robin algorithm.
+```
+gor --input-raw :80 --split-output --output-tcp replay1.local:28020 --output-tcp replay2.local:28020
+```
+
+[GoReplay PRO](https://goreplay.org/pro.html) support accurate recording and replaying of tcp sessions, and when `--recognize-tcp-sessions` option is passed, instead of round-robin it will use a smarter algorithm which ensures that same sessions will be sent to the same replay instance.
+
+
+In case if you are planning a large load testing, you may consider use separate master instance which will control Gor slaves which actually replay traffic. For example:
+```
+# This command will read multiple log files, replay them on 10x speed and loop them if needed for 30 seconds, and will distributed traffic (tcp session aware) among multiple workers
+gor --input-file logs_from_multiple_machines.*|1000% --input-file-loop --exit-after 30s --recognize-tcp-sessions --split-output --output-tcp worker1.local --output-tcp worker2.local:27017 --output-tcp worker3.local:27017 ...  --output-tcp workerN.local:27017
+
+# worker 
+gor --input-tcp :27017 --ouput-http load_test.target
+```

docs/Exporting-to-ElasticSearch.md

@@ -0,0 +1,38 @@
+Gor can export requests and replayed response data to ElasticSearch:
+
+```
+./gor --input-raw :8000 --output-http http://staging.com  --output-http-elasticsearch localhost:9200/gor
+```
+
+You don't have to create the index upfront. That will be done for you automatically.
+
+### Format
+
+Following structure represents ES format:
+
+```
+type ESRequestResponse struct {
+	ReqURL               string `json:"Req_URL"`
+	ReqMethod            string `json:"Req_Method"`
+	ReqUserAgent         string `json:"Req_User-Agent"`
+	ReqAcceptLanguage    string `json:"Req_Accept-Language,omitempty"`
+	ReqAccept            string `json:"Req_Accept,omitempty"`
+	ReqAcceptEncoding    string `json:"Req_Accept-Encoding,omitempty"`
+	ReqIfModifiedSince   string `json:"Req_If-Modified-Since,omitempty"`
+	ReqConnection        string `json:"Req_Connection,omitempty"`
+	ReqCookies           string `json:"Req_Cookies,omitempty"`
+	RespStatus           string `json:"Resp_Status"`
+	RespStatusCode       string `json:"Resp_Status-Code"`
+	RespProto            string `json:"Resp_Proto,omitempty"`
+	RespContentLength    string `json:"Resp_Content-Length,omitempty"`
+	RespContentType      string `json:"Resp_Content-Type,omitempty"`
+	RespTransferEncoding string `json:"Resp_Transfer-Encoding,omitempty"`
+	RespContentEncoding  string `json:"Resp_Content-Encoding,omitempty"`
+	RespExpires          string `json:"Resp_Expires,omitempty"`
+	RespCacheControl     string `json:"Resp_Cache-Control,omitempty"`
+	RespVary             string `json:"Resp_Vary,omitempty"`
+	RespSetCookie        string `json:"Resp_Set-Cookie,omitempty"`
+	Rtt                  int64  `json:"RTT"`
+	Timestamp            time.Time
+}
+```

docs/FAQ.md

@@ -0,0 +1,32 @@
+### What OS are supported?
+Gor will run everywhere where [libpcap](http://www.tcpdump.org/) works, and it works on most of the platforms. However, currently, we test it on Linux and Mac. See more about [[Compilation]].
+
+### Why does the `--input-raw` requires sudo or root access?
+Listener works by sniffing traffic from a given port. It's accessible
+only by using sudo or root access. But it is possible to [[Running as non root user]].
+
+### How do you deal with user session to replay the traffic correctly?
+You can rewrite session related headers/params to match your staging environment. If you require custom logic (e.g random token based auth) follow this discussion: https://github.com/buger/gor/issues/154
+
+### Can I use Gor to intercept SSL traffic?
+Basic idea is that SSL was made to protect itself from traffic interception. There 2 options: 
+1. Move SSL handling to proxy like Nginx or Amazon ELB. And allow Gor to listen on upstreams. 
+2. Use `--input-http` so you can duplicate request payload directly from your app to Gor, but it will require your app modifications.
+
+More can be find here: https://github.com/buger/gor/issues/85
+
+### Is there a limit for size of HTTP request when using output-http?
+Due to the fact that Gor can't guarantee interception of all packets, for large payloads > 200kb there is chance of missing some packets and corrupting body. Treat it as a feature and chance to test broken bodies handling :)
+The only way to guarantee delivery is using `--input-http`, but you will miss some features.
+
+### I'm getting 'too many open files' error
+Typical Linux shell has a small open files soft limit at 1024. You can easily raise that when you do this before starting your gor replay process:
+  
+  ulimit -n 64000
+
+More about ulimit: http://www.thecodingmachine.com/solving-the-too-many-open-files-exception-in-red5-or-any-other-application/
+
+### The CPU average across my load-balanced targets is higher than the source
+If you are replaying traffic from multiple listeners to a load-balanced target and you use sticky sessions, you may observe that the target servers have a higher CPU load than the listener servers. This may be because the sticky session cookie of the original load balancer is not honored by the target load balancer thus resulting in requests that would normally hit the same target server hitting different servers on the backend thus reducing some caching benefits gained via the load balancing.  Try running just one listener against one replay target and see if the CPU utilization comparison is more accurate.
+
+Also see [[Troubleshooting]].

docs/Middleware.md

@@ -0,0 +1,74 @@
+#### Overview
+Middleware is a program that accepts request and response payload at STDIN and emits modified requests at STDOUT. You can implement any custom logic like stripping private data, advanced rewriting, support for oAuth and etc. Check examples [included into our repo](https://github.com/buger/gor/tree/master/examples/middleware).
+
+
+```
+                   Original request      +--------------+
++-------------+----------STDIN---------->+              |
+|  Gor input  |                          |  Middleware  |
++-------------+----------STDIN---------->+              |
+                   Original response (1) +------+---+---+
+                                                |   ^
++-------------+    Modified request             v   |
+| Gor output  +<---------STDOUT-----------------+   |
++-----+-------+                                     |
+      |                                             |
+      |            Replayed response                |
+      +------------------STDIN----------------->----+
+```
+
+(1): Original responses will only be sent to the middleware if the `--input-raw-track-response` option is specified.
+
+Middleware can be written in any language, see `examples/middleware` folder for examples.
+Middleware program should accept the fact that all communication with Gor is asynchronous, there is no guarantee that original request and response messages will come one after each other. Your app should take care of the state if logic depends on original or replayed response, see `examples/middleware/token_modifier.go` as example.
+
+Simple bash echo middleware (returns same request) will look like this:
+```bash
+while read line; do
+  echo $line
+done
+```
+
+Middleware can be enabled using `--middleware` option, by specifying path to executable file:
+```
+gor --input-raw :80 --middleware "/opt/middleware_executable" --output-http "http://staging.server"
+```
+
+#### Communication protocol
+All messages should be hex encoded, new line character specifieds the end of the message, eg. new message per line.
+
+Decoded payload consist of 2 parts: header and HTTP payload, separated by new line character.  
+
+Example request payload:
+
+```
+1 932079936fa4306fc308d67588178d17d823647c 1439818823587396305
+GET /a HTTP/1.1
+Host: 127.0.0.1
+
+```
+
+Example response payload (note: you will only receive this if you specify `--input-raw-track-response`)
+
+```
+2 8e091765ae902fef8a2b7d9dd960e9d52222bd8c 1439818823587996305 2782013
+HTTP/1.1 200 OK
+Date: Mon, 17 Aug 2015 13:40:23 GMT
+Content-Length: 0
+Content-Type: text/plain; charset=utf-8
+
+```
+
+Header contains request meta information separated by spaces. First value is payload type, possible values: `1` - request, `2` - original response, `3` - replayed response.
+Next goes request id: unique among all requests (sha1 of time and Ack), but remain same for original and replayed response, so you can create associations between request and responses. The third argument is the time when request/response was initiated/received. Forth argument is populated only for responses and means latency.
+
+HTTP payload is unmodified HTTP requests/responses intercepted from network. You can read more about request format [here](http://www.jmarshall.com/easy/http/), [here](https://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol) and [here](http://www.w3.org/Protocols/rfc2616/rfc2616.html). You can operate with payload as you want, add headers, change path, and etc. Basically you just editing a string, just ensure that it is RCF compliant.
+
+At the end modified (or untouched) request should be emitted back to STDOUT, keeping original header, and hex-encoded. If you want to filter request, just not send it. Emitting responses back is required, even if you did not touch them.
+
+#### Advanced example
+Imagine that you have auth system that randomly generate access tokens, which used later for accessing secure content. Since there is no pre-defined token value, naive approach without middleware (or if middleware use only request payloads) will fail, because replayed server have own tokens, not synced with origin. To fix this, our middleware should take in account responses of replayed and origin server, store `originalToken -> replayedToken` aliases and rewrite all requests using this token to use replayed alias. See [examples/middleware/token_modifier.go](https://github.com/buger/gor/tree/master/examples/middleware/token_modifier.go) and [middleware_test.go#TestTokenMiddleware](https://github.com/buger/gor/tree/master/middleware_test.go) as example of described scheme.
+
+***
+
+You may also read about [[Request filtering]], [[Rate limiting]] and [[Request rewriting]].

docs/Rate-limiting.md

@@ -0,0 +1,37 @@
+Rate limiting can be useful if you only want to forward parts of incoming traffic, for example, to not overload your test environment. There are two strategies: dropping random requests or dropping fractions of requests based on Header or URL param value. 
+
+### Dropping random requests
+Every input and output support random rate limiting.
+There are two limiting algorithms: absolute or percentage based. 
+
+**Absolute**: If for current second it reached specified requests limit - disregard the rest, on next second counter reset.
+
+**Percentage**: For input-file it will slowdown or speedup request execution, for the rest it will use the random generator to decide if request pass or not based on the chance you specified. 
+
+You can specify your desired limit using the "|" operator after the server address, see examples below.
+
+#### Limiting replay using absolute number
+```
+# staging.server will not get more than ten requests per second
+gor --input-tcp :28020 --output-http "http://staging.com|10"
+```
+
+#### Limiting listener using percentage based limiter
+```
+# replay server will not get more than 10% of requests 
+# useful for high-load environments
+gor --input-raw :80 --output-tcp "replay.local:28020|10%"
+```
+
+### Consistent limiting based on Header or URL param value
+If you have unique user id (like API key) stored in header or URL you can consistently forward specified percent of traffic only for the fraction of this users. 
+Basic formula looks like this: `FNV32-1A_hashing(value) % 100 >= chance`. Examples:
+```
+# Limit based on header value
+gor --input-raw :80 --output-tcp "replay.local:28020|10%" --http-header-limiter "X-API-KEY: 10%"
+
+# Limit based on header value
+gor --input-raw :80 --output-tcp "replay.local:28020|10%" --http-param-limiter "api_key: 10%"
+```
+
+When limiting based on header or param only percentage based limiting supported.

docs/Replaying-HTTP-traffic.md

@@ -0,0 +1,46 @@
+Gor can replay HTTP traffic using `--output-http` option:
+
+```bash
+sudo ./gor --input-raw :8000 --output-http="http://staging.env"
+```
+
+You can [filter](Request filtering), [rate limit](Rate limiting) and [rewrite](Request rewriting) requests on the fly. 
+
+### HTTP output workers
+By default Gor creates a dynamic pool of workers: it starts with 10 and creates more HTTP output workers when the HTTP output queue length is greater than 10.  The number of workers created (N) is equal to the queue length at the time which it is checked and found to have a length greater than 10. The queue length is checked every time a message is written to the HTTP output queue.  No more workers will be spawned until that request to spawn N workers is satisfied.  If a dynamic worker cannot process a message at that time, it will sleep for 100 milliseconds. If a dynamic worker cannot process a message for 2 seconds it dies.
+You may specify fixed number of workers using  `--output-http-workers=20` option.
+
+### Following redirects
+By default Gor will ignore all redirects since they are handled by clients using your app, but in scenarios where your replayed environment introduces new redirects, you can enable them like this: 
+```
+gor --input-tcp replay.local:28020 --output-http http://staging.com --output-http-redirects 2
+```
+The given example will follow up to 2 redirects per request.
+
+### HTTP timeouts
+By default http timeout for both request and response is 5 seconds. You can override it like this:
+```
+gor --input-tcp replay.local:28020 --output-http http://staging.com --output-http-timeout 30s
+```
+
+### Response buffer
+By default, to reduce memory consumption, internal HTTP client will fetch max 200kb of the response body (used if you use middleware), by you can increase limit using `--output-http-response-buffer` option (accepts number of bytes).
+
+### Basic Auth
+
+If your development or staging environment is protected by Basic Authentication then those credentials can be injected in during the replay:
+
+```
+gor --input-raw :80 --output-http "http://user:pass@staging.com"
+```
+
+Note: This will overwrite any Authorization headers in the original request.
+
+
+### Multiple domains support
+
+If you app accepts traffic from multiple domains, and you want to keep original headers, there is specific `--http-original-host` with tells Gor do not touch Host header at all.
+
+
+***
+You may also read about [[Saving and Replaying from file]]

docs/Request-filtering.md

@@ -0,0 +1,35 @@
+Filtering is useful when you need to capture only specific part of traffic, like API requests. It is possible to filter by URL, HTTP header or HTTP method.
+
+#### Allow url regexp
+```
+# only forward requests being sent to the /api endpoint
+gor --input-raw :8080 --output-http staging.com --http-allow-url /api
+```
+
+#### Disallow url regexp
+```
+# only forward requests NOT being sent to the /api... endpoint
+gor --input-raw :8080 --output-http staging.com --http-disallow-url /api
+```
+#### Filter based on regexp of header
+
+```
+# only forward requests with an api version of 1.0x
+gor --input-raw :8080 --output-http staging.com --http-allow-header api-version:^1\.0\d
+
+# only forward requests NOT containing User-Agent header value "Replayed by Gor"
+gor --input-raw :8080 --output-http staging.com --http-disallow-header "User-Agent: Replayed by Gor"
+```
+
+#### Filter based on HTTP method
+Requests not matching a specified whitelist can be filtered out. For example to strip non-nullipotent requests:
+
+```
+gor --input-raw :80 --output-http "http://staging.server" \
+    --http-allow-method GET \
+    --http-allow-method OPTIONS
+```
+
+
+-----
+You may also read about [[Request rewriting]], [[Rate limiting]] and [[Middleware]]

docs/Request-rewriting.md

@@ -0,0 +1,38 @@
+Gor supports rewriting of URLs, URL params and headers, see below.
+
+Rewriting may be useful if you test environment does not have the same data as your production, and you want to perform all actions in the context of `test` user: for example rewrite all API tokens to some test value. Other possible use cases are toggling features on/off using custom headers or rewriting URL's if they changed in the new environment.
+
+For more complex logic you can use [Middleware](middleware.md).
+
+#### Rewrite URL based on a mapping
+`--http-rewrite-url` expects value in "<search>:<replace>" format: ":" is a dilimiter. In `<replace>` section you may use captured regexp group values. This works similar to `replace` method in Javascript or `gsub` in Ruby. 
+
+```
+# Rewrites all `/v1/user/<user_id>/ping` requests to `/v2/user/<user_id>/ping`
+gor --input-raw :8080 --output-http staging.com --http-rewrite-url /v1/user/([^\\/]+)/ping:/v2/user/$1/ping
+```
+
+#### Set URL param
+Set request url param, if param already exists it will be overwritten.
+```
+gor --input-raw :8080 --output-http staging.com --http-set-param api_key=1
+```
+
+#### Set Header
+Set request header, if header already exists it will be overwritten. May be useful if you need to identify requests generated by Gor or enable feature flagged functionality in an application:
+
+```
+gor --input-raw :80 --output-http "http://staging.server" \
+    --http-set-header "User-Agent: Replayed by Gor" \
+    --http-set-header "Enable-Feature-X: true"
+```
+
+#### Host header
+Host header gets special treatment. By default Host get set to the value specified in --output-http. If you manually set --http-set-header "Host: anonther.com", Gor will not override Host value.
+
+If you app accepts traffic from multiple domains, and you want to keep original headers, there is specific `--http-original-host` with tells Gor do not touch Host header at all.
+
+
+***
+
+You may also read about [[Request filtering]], [[Rate limiting]] and [[Middleware]]

docs/Running-as-non-root-user.md

@@ -0,0 +1,17 @@
+You can enable Gor for non-root users in a secure method by using the following commands
+
+``` 
+# Following commands assume that you put `gor` binary to /usr/local/bin
+add gor
+addgroup <username> gor
+chgrp gor /usr/local/bin/gor
+chmod 0750 /usr/local/bin/gor
+setcap "cap_net_raw,cap_net_admin+eip" /usr/local/bin/gor
+```
+ 
+As a brief explanation of the above.
+* We create a group called gor. 
+* We then add the user you want to the new group so they will be able to use gor without sudo
+* We then change the user/group of gor binary the new group.
+* We then make sure the permissions are set on gor binary so that members of the group can execute it but other normal users cannot.
+* We then use `setcap` to give the CAP_NET_RAW and CAP_NET_ADMIN privilege to the executable when it runs. This is so that Gor can open its raw socket which is not normally permitted unless you are root.

docs/Saving-and-Replaying-from-file.md

@@ -0,0 +1,105 @@
+You can save requests to file, and replay them later. While replaying it will preserve the original time differences between requests. If you apply [percentage based limiting](Rate Limiting) timing between requests will be reduced or increased appropriately: this approach opens possibilities like load testing, see below.
+
+```bash
+# write to file
+gor --input-raw :80 --output-file requests.log
+
+# read from file
+gor --input-file requests.gor --output-http "http://staging.com"
+```
+
+By default Gor writes files in chunks. This configurable using `--output-file-append` option: the flushed chunk is appended to existence file or not. The default is **false**. By default, `--output-file` flushes each chunk to a different path.
+
+```bash
+gor ... --output-file %Y%m%d.log
+# append false
+20140608_0.log
+20140608_1.log
+20140609_0.log
+20140609_1.log
+```
+
+This makes parallel file processing easy. But if you want to disable this behavior, you can disable it by adding `--output-file-append` option:
+
+```bash
+gor ... --output-file %Y%m%d.log --output-file-append
+# append true
+20140608.log
+20140609.log
+```
+
+If you run gor multiple times, and it finds existing files, it will continue from last known index.
+
+### Chunk size
+
+You can set chunk limits using `--output-file-size-limit` and `--output-file-queue-limit` options.
+The length of the chunk queue and the size of each chunk, respectively. The default values are 256 and 32mb, respectively. The suffixes “k” (KB), “m” (MB), and “g” (GB) can be used for `output-file-size-limit`.
+If you want to have only size constraint, you can set `--output-file-queue-limit` to 0, and vice versa.
+
+```bash
+gor --input-raw :80 --output-file %Y-%m-%d.gz --output-file-size-limit 256m --output-file-queue-limit 0
+```
+
+### Using date variables in file names
+For example, you can tell to create new file each hour: `--output-file /mnt/logs/requests-%Y-%m-%d-%H.log`
+It will create new file for each hour: requests-2016-06-01-12.log, requests-2016-06-01-13.log, ...
+
+The time format used as part of the file name. The following characters are replaced with actual values when the file is created:
+
+* `%Y`: year including the century (at least 4 digits)
+* `%m`: month of the year (01..12)
+* `%d`: Day of the month (01..31)
+* `%H`: Hour of the day, 24-hour clock (00..23)
+* `%M`: Minute of the hour (00..59)
+* `%S`: Second of the minute (00..60)
+
+The default format is `%Y%m%d%H`, which creates one file per hour.
+
+
+### GZIP compression
+To read or write GZIP compressed files ensure that file extension ends with ".gz": `--output-file log.gz`
+
+### Replaying from multiple files
+
+`--input-file` accepts file pattern, for example: `--input-file logs-2016-05-*`: it will replay all the files, sorting them in lexicographical order.
+
+### Buffered file output
+Gor has memory buffer when it writes to file, and continuously flush changes to the file. Flushing to file happens if the buffer is filled, forced flush every 1 second, or if Gor is closed. You can change it using `--output-file-flush-interval` option. It most cases it should not be touched.
+
+### File format
+HTTP requests stored as it is, plain text: headers and bodies. Requests separated by `\n🐵🙈🙉\n` line (using such sequence for uniqueness and fun). Before each request goes single line with meta information containing payload type (1 - request, 2 - response, 3 - replayed response), unique request ID (request and response have the same) and timestamp when request was made. An example of 2 requests:
+
+```
+1 d7123dasd913jfd21312dasdhas31 127345969\n
+GET / HTTP/1.1\r\n
+\r\n
+\n
+🐵🙈🙉
+\n
+POST /upload HTTP/1.1\r\n
+Content-Length: 7\r\n
+Host: www.w3.org\r\n
+\r\n
+a=1&b=2
+```
+Note that technically \r and \n symbols are invisible, and indicate new lines. I made them visible in example just to show how it looks on byte level.
+
+Making it text friendly allows writing simple parsers and use console tools like `grep` to do an analysis. You can even edit them manually, but be sure that your file editor does not change line endings.
+
+## Performance testing
+
+Currently, this functionality supported only by `input-file` and only when using percentage based limiter. Unlike default limiter for `input-file` instead of dropping requests it will slowdown or speedup request emitting. Note that **limiter is applied to input**:
+
+```
+# Replay from file on 2x speed 
+gor --input-file "requests.gor|200%" --output-http "staging.com"
+```
+
+Use `--stats --output-http-stats` to see latency stats.
+
+### Looping files for replaying indefinitely
+You can loop the same set of files, so when the last one replays all the requests, it will not stop, and will start from first one again. Having the only small amount of requests you can do extensive performance testing.
+Pass `--input-file-loop` to make it work. 
+
+***
+You may also read about [[Capturing and replaying traffic]] and [[Rate limiting]]

docs/Troubleshooting.md

@@ -0,0 +1,90 @@
+Gor can report stats on the `output-tcp` and `output-http` request queues. Stats are reported to the console every 5 seconds in the form `latest,mean,max,count,count/second` by using the `--output-http-stats` and `--output-tcp-stats` options.
+
+Examples:
+
+```
+2014/04/23 21:17:50 output_tcp:latest,mean,max,count,count/second
+2014/04/23 21:17:50 output_tcp:0,0,0,0,0
+2014/04/23 21:17:55 output_tcp:1,1,2,68,13
+2014/04/23 21:18:00 output_tcp:1,1,2,92,18
+2014/04/23 21:18:05 output_tcp:1,1,2,119,23
+```
+
+```
+2014/04/23 21:19:46 output_http:latest,mean,max,count,count/second
+2014/04/23 21:19:46 output_http:0,0,0,0,0
+2014/04/23 21:19:51 output_http:0,0,0,0,0
+2014/04/23 21:19:56 output_http:0,0,0,0,0
+2014/04/23 21:20:01 output_http:1,0,1,50,10
+2014/04/23 21:20:06 output_http:1,1,4,72,14
+2014/04/23 21:20:11 output_http:1,0,1,179,35
+2014/04/23 21:20:16 output_http:1,0,1,148,29
+2014/04/23 21:20:21 output_http:1,1,2,91,18
+2014/04/23 21:20:26 output_http:1,1,2,150,30
+2014/04/23 21:18:15 output_http:100,99,100,70,14
+2014/04/23 21:18:21 output_http:100,99,100,55,11
+```
+
+### How can I tell if I have bottlenecks?
+Key areas that sometimes experience bottlenecks are the output-tcp and output-http functions which have internal queues for requests. Each queue has an upper limit of 100. Enable stats reporting to see if any queues are experiencing bottleneck behavior.
+ 
+#### Output HTTP bottlenecks
+When running a Gor replay the output-http feature may bottleneck if:
+
+  * the replay has inadequate bandwidth. If the replay is receiving or sending more messages than its network adapter can handle the output-http-stats  may report that the output-http queue is filling up. See if there is a way to upgrade the replay's bandwidth.
+  * with `--output-http-workers` set to anything other than `-1` the `-output-http` target is unable to respond to messages in a timely manner. The http output workers which take messages off the output-http queue, process the request, and ensure that the request did not result in an error may not be able to keep up with the number of incoming requests. If the replay is not using dynamic worker scaling (`--output-http-workers=-1`)  The optimal number of output-http-workers can be determined with the formula `output-workers = (Average number of requests per second)/(Average target response time per second)`.
+
+#### Output TCP bottlenecks
+When using the Gor listener the output-tcp feature may bottleneck if:
+
+  * the replay is unable to accept and process more requests than the listener is able generate. Prior to troubleshooting the output-tcp bottleneck, ensure that the replay target is not experiencing any bottlenecks. 
+  * the replay target has inadequate bandwidth to handle all its incoming requests.  If a replay target's incoming bandwidth is maxed out the output-tcp-stats may report that the output-tcp queue is filling up. See if there is a way to upgrade the replay's bandwidth.
+
+
+#### Tuning
+
+To achieve the top most performance you should tune the source server system limits:
+
+    net.ipv4.tcp_max_tw_buckets = 65536
+    net.ipv4.tcp_tw_recycle = 1
+    net.ipv4.tcp_tw_reuse = 0
+    net.ipv4.tcp_max_syn_backlog = 131072
+    net.ipv4.tcp_syn_retries = 3
+    net.ipv4.tcp_synack_retries = 3
+    net.ipv4.tcp_retries1 = 3
+    net.ipv4.tcp_retries2 = 8
+    net.ipv4.tcp_rmem = 16384 174760 349520
+    net.ipv4.tcp_wmem = 16384 131072 262144
+    net.ipv4.tcp_mem = 262144 524288 1048576
+    net.ipv4.tcp_max_orphans = 65536
+    net.ipv4.tcp_fin_timeout = 10
+    net.ipv4.tcp_low_latency = 1
+    net.ipv4.tcp_syncookies = 0
+***
+
+### Gor is crashing with following stacktrace
+```
+fatal error: unexpected signal during runtime execution
+[signal 0xb code=0x1 addr=0x63 pc=0x7ffcdfdf8b2c]
+
+runtime stack:
+runtime.throw(0xad8380, 0x2a)
+	/usr/local/go/src/runtime/panic.go:547 +0x90
+runtime.sigpanic()
+	/usr/local/go/src/runtime/sigpanic_unix.go:12 +0x5a
+
+goroutine 103 [syscall, locked to thread]:
+runtime.cgocall(0x7b35a0, 0xc82121f1e8, 0x0)
+	/usr/local/go/src/runtime/cgocall.go:123 +0x11b fp=0xc82121f188 sp=0xc82121f158
+net._C2func_getaddrinfo(0x7ffcec0008c0, 0x0, 0xc821b221e0, 0xc8217b2b18, 0x0, 0x0, 0x0)
+	??:0 +0x55 fp=0xc82121f1e8 sp=0xc82121f188
+net.cgoLookupIPCNAME(0x7fffb17208ab, 0x12, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xb17200)
+```
+
+There is a chance that you hit Go bug. The crash comes from the CGO version of DNS resolver.
+By default Go based version used, but ins some cases [it switches to CGO based](https://golang.org/pkg/net/#hdr-Name_Resolution). It is possible to force Go based DNS resolver using GODEBUG environment variable:
+`sudo GODEBUG="netdns=go" ./gor --input-raw :80 --output-http staging.env`
+
+
+
+Also, see [[FAQ]]

docs/_Footer.md

@@ -0,0 +1 @@
+[Website](https://goreplay.org) | [PRO version](https://goreplay.org/pro.html) | [[Getting started]] | [[FAQ]] | [Join newsletter](https://www.getdrip.com/forms/89690474/submissions/new)

docs/_config.yml

@@ -0,0 +1 @@
+theme: jekyll-theme-cayman

docs/commercial/collaboration.md

@@ -0,0 +1,19 @@
+Collaboration is difficult with commercial closed source but I do want to keep as much of the OSS ethos as possible available to customers who want to fix it themselves.
+
+## Legal
+
+In order to unambiguously own and sell Gor commercial products, I must have the copyright associated with the entire codebase.  Any code you create which is merged must be owned by me.  That's not me trying to be a jerk, that's just the way it works.
+
+## Application
+
+If you wish access to the product repository so you can send a PR, just open a new Gor issue and include the following info:
+
+1. the email address that bought the license, a max of one collaborator per license
+1. the following statement "I assign all rights, including copyright, to any future Gor work by myself to Leonid Bugaev"
+
+You should be granted access to the private repo soon after.
+
+## Notes
+
+1. You should **never** work on the master branch.  Only I may merge changes.
+1. I may revoke access for any reason at any time.  Access is not guaranteed with purchase.

docs/commercial/faq.md

@@ -0,0 +1,58 @@
+### What are GoReplay PRO and GoReplay Enterprise?
+
+[GoReplay PRO](https://goreplay.org/pro.html) and GoReplay Enterprise are extensions to GoReplay which add more functionality and provide additional support options for customers.
+
+### Is there a trial version?
+
+There's no free trial but we do offer a 14 day period with full refund if it does not work for you.
+
+### What is the license?
+
+See [COMM-LICENSE](https://github.com/buger/gor/blob/master/COMM-LICENSE) in the root of the GoReplay repo.
+
+### How does PRO licensing work?
+
+Every organization running GoReplay Pro on its own servers must have a license.  There's no limit to the amount of servers or environments used by that organization.
+
+### How does Enterprise licensing work?
+
+Every organization running Gor Enterprise on its own servers must have a license. There's **no limit** to the amount of servers or environments used by that organization.
+
+### What happens if my subscription lapses?
+
+You must have an active subscription to run GoReplay Pro or Enterprise.  After a one week grace period, you'll lose access to binaries and priority support.  You won't get any more updates or bug fixes.
+
+### How do I buy GoReplay Enterprise?
+
+Send email to [support@gortool.com](mailto:support@gortool.com) with your info.  A PDF quote will be emailed to you with the price.  Reply to that email with your purchase order or just "Sounds good" and we will send an invoice which can be paid with a credit card, ACH bank transfer or a paper check.
+
+### Can I upgrade from GoReplay Pro?
+
+Yes!  Current subscribers can upgrade by [requesting a quote](mailto:support@gortool.com).  **Please note that you are an existing Pro subscriber.**  We will add a one-time discount on your first invoice to reflect any remaining Pro subscription credit.  If you purchased GoReplay Pro 6 months ago for $950, you'll get a $475 discount.
+
+### Can I distribute GoReplay PRO or Enterprise to my customers?
+
+This is a common requirement for "on-site installs" or "appliances" sold to large corporations.
+
+The standard license is appropriate for SaaS usage as it does not allow distribution.  GoReplay PRO and Enterprise have an Appliance license option which **does** allow you to distribute them.  The Appliance license is $9,500/yr for Pro and $19,500/yr for Enterprise.  It allows you to distribute the Pro or Enterprise binaries as part of your application and each of your customers to run GoReplay Pro or Enterprise. Email [support@gortool.com](mailto:support@gortool.com) to purchase.
+
+### Can you transfer a license?
+
+Licenses are **not** transferable to another company.  We will transfer the license from a user-specific email to a group email address (e.g. john_smith@example.com -> tech@example.com) but only for **the same domain**.  It is strongly recommended that you buy the license using a group email address so the license is not attached to any one employee's email address.
+
+### What does the license require me to do?
+
+Your purchase gets you a unique access URL for downloading the Pro and/or Enterprise binaries.  The license agreement requires you to keep this access URL private.  If we find your access URL is ever publicized:
+
+1. We'll send you a warning email with details.  You need to remove the content and send a new email address so we can generate a new access URL for you.  The old access URL will stop working immediately so you'll need to update your apps.
+2. If your access URL is publicized a second time, we reserve the right to permanently remove access.
+
+### Can I get a refund?
+
+Yes, up to two weeks after purchase.  Let us know the reason and maybe we can help but either way it's not a problem.  Email [support@gortool.com](mailto:support@gortool.com).
+
+### How do I update my credit card info?
+
+If you purchased GoReplay Enterprise, there's nothing to do.  Each annual invoice is paid separately.
+
+If you purchased GoReplay PRO, log into [Gumroad](https://gumroad.com) with your email address, click the Billing tab and enter your new card.  I can't provide support for the Gumroad website and don't have the ability to edit customer info - if you can't log in or change your credit card, you can always let your current subscription expire and purchase a new subscription.

docs/commercial/support.md

@@ -0,0 +1,11 @@
+Gor offers only community support.  Gor Pro and Enterprise offer priority support via email.
+
+## Priority Support
+
+Covers 1 incident per quarter, with a max response time of 2 working days. Scope is limited to Gor and Gor Pro and Enterprise features and APIs, not the application or infrastructure.  For support, email **support** AT **gortool.com**.  Please email using the same domain as the original license email or explain your connection to the licensed company.
+
+More aggressive support contracts (phone, quicker response time) are available separately, email with your needs.
+
+## Onboarding
+
+Enterprise customers may request a one hour video chat session with @buger to discuss their application(s), requirements and how best to leverage the various Gor features.  Contact support to set up your session.

docs/css/breadcrumbs.css

@@ -0,0 +1,39 @@
+.wy-breadcrumbs li {
+  display: inline-block;
+}
+
+.wy-breadcrumbs li.wy-breadcrumbs-aside {
+  float: right;
+}
+
+.wy-breadcrumbs li a {
+  display: inline-block;
+  padding: 5px;
+}
+
+.wy-breadcrumbs li a:first-child {
+  padding-left: 0;
+}
+
+.wy-breadcrumbs-extra {
+  margin-bottom: 0;
+  color: #b3b3b3;
+  font-size: 80%;
+  display: inline-block;
+}
+
+@media screen and (max-width: 480px) {
+  .wy-breadcrumbs-extra {
+    display: none;
+  }
+
+  .wy-breadcrumbs li.wy-breadcrumbs-aside {
+    display: none;
+  }
+}
+
+@media print {
+  .wy-breadcrumbs li.wy-breadcrumbs-aside {
+    display: none;
+  }
+}

docs/css/code.css

@@ -0,0 +1,355 @@
+.codeblock-example {
+  border: 1px solid #e1e4e5;
+  border-bottom: none;
+  padding: 24px;
+  padding-top: 48px;
+  font-weight: 500;
+  background: #fff;
+  position: relative;
+}
+
+.codeblock-example:after {
+  content: "Example";
+  position: absolute;
+  top: 0;
+  left: 0;
+  background: #9B59B6;
+  color: #fff;
+  padding: 6px 12px;
+}
+
+.codeblock-example.prettyprint-example-only {
+  border: 1px solid #e1e4e5;
+  margin-bottom: 24px;
+}
+
+.codeblock,
+pre.literal-block,
+.rst-content .literal-block,
+.rst-content pre.literal-block,
+div[class^='highlight'] {
+  border: 1px solid #e1e4e5;
+  padding: 0;
+  overflow-x: auto;
+  background: #fff;
+  margin: 1px 0 24px;
+}
+
+.codeblock div[class^='highlight'],
+pre.literal-block div[class^='highlight'],
+.rst-content .literal-block div[class^='highlight'],
+div[class^='highlight'] div[class^='highlight'] {
+  border: none;
+  background: none;
+  margin: 0;
+}
+
+div[class^='highlight'] td.code {
+  width: 100%;
+}
+
+.linenodiv pre {
+  border-right: solid 1px #e6e9ea;
+  margin: 0;
+  padding: 12px;
+  font-family: "Source Code Pro","Andale Mono WT","Andale Mono","Lucida Console","Lucida Sans Typewriter","DejaVu Sans Mono","Bitstream Vera Sans Mono","Liberation Mono","Nimbus Mono L",Monaco,"Courier New",Courier,monospace;
+  font-size: 12px;
+  line-height: 1.5;
+  color: #d9d9d9;
+}
+
+div[class^='highlight'] pre {
+  white-space: pre;
+  margin: 0;
+  padding: 12px;
+  font-family: "Source Code Pro","Andale Mono WT","Andale Mono","Lucida Console","Lucida Sans Typewriter","DejaVu Sans Mono","Bitstream Vera Sans Mono","Liberation Mono","Nimbus Mono L",Monaco,"Courier New",Courier,monospace;
+  font-size: 12px;
+  line-height: 1.5;
+  display: block;
+  overflow: auto;
+  color: #404040;
+}
+
+@media print {
+  .codeblock,
+  pre.literal-block,
+  .rst-content .literal-block,
+  .rst-content pre.literal-block,
+  div[class^='highlight'],
+  div[class^='highlight'] pre {
+    white-space: pre-wrap;
+  }
+
+}
+
+.hll {
+  background-color: #ffc;
+  margin: 0 -12px;
+  padding: 0 12px;
+  display: block;
+}
+
+.c {
+  color: #998;
+  font-style: italic;
+}
+
+.err {
+  color: #a61717;
+  background-color: #e3d2d2;
+}
+
+.k {
+  font-weight: 700;
+}
+
+.o {
+  font-weight: 700;
+}
+
+.cm {
+  color: #998;
+  font-style: italic;
+}
+
+.cp {
+  color: #999;
+  font-weight: 700;
+}
+
+.c1 {
+  color: #998;
+  font-style: italic;
+}
+
+.cs {
+  color: #999;
+  font-weight: 700;
+  font-style: italic;
+}
+
+.gd {
+  color: #000;
+  background-color: #fdd;
+}
+
+.gd .x {
+  color: #000;
+  background-color: #faa;
+}
+
+.ge {
+  font-style: italic;
+}
+
+.gr {
+  color: #a00
+}
+
+.gh {
+  color: #999;
+}
+
+.gi {
+  color: #000;
+  background-color: #dfd;
+}
+
+.gi .x {
+  color: #000;
+  background-color: #afa;
+}
+
+.go {
+  color: #888;
+}
+
+.gp {
+  color: #555;
+}
+
+.gs {
+  font-weight: 700;
+}
+
+.gu {
+  color: purple;
+  font-weight: 700;
+}
+
+.gt {
+  color: #a00;
+}
+
+.kc {
+  font-weight: 700;
+}
+
+.kd {
+  font-weight: 700;
+}
+
+.kn {
+  font-weight: 700;
+}
+
+.kp {
+  font-weight: 700;
+}
+
+.kr {
+  font-weight: 700;
+}
+
+.kt {
+  color: #458;
+  font-weight: 700;
+}
+
+.m {
+  color: #099;
+}
+
+.s {
+  color: #d14;
+}
+
+.n {
+  color: #333;
+}
+
+.na {
+  color: teal;
+}
+
+.nb {
+  color: #0086b3;
+}
+
+.nc {
+  color: #458;
+  font-weight: 700;
+}
+
+.no {
+  color: teal;
+}
+
+.ni {
+  color: purple;
+}
+
+.ne {
+  color: #900;
+  font-weight: 700;
+}
+
+.nf {
+  color: #900;
+  font-weight: 700;
+}
+
+.nn {
+  color: #555;
+}
+
+.nt {
+  color: navy;
+}
+
+.nv {
+  color: teal;
+}
+
+.ow {
+  font-weight: 700;
+}
+
+.w {
+  color: #bbb;
+}
+
+.mf {
+  color: #099;
+}
+
+.mh {
+  color: #099;
+}
+
+.mi {
+  color: #099;
+}
+
+.mo {
+  color: #099;
+}
+
+.sb {
+  color: #d14;
+}
+
+.sc {
+  color: #d14;
+}
+
+.sd {
+  color: #d14;
+}
+
+.s2 {
+  color: #d14
+}
+
+.se {
+  color: #d14;
+}
+
+.sh {
+  color: #d14;
+}
+
+.si {
+  color: #d14;
+}
+
+.sx {
+  color: #d14;
+}
+
+.sr {
+  color: #009926;
+}
+
+.s1 {
+  color: #d14;
+}
+
+.ss {
+  color: #990073;
+}
+
+.bp {
+  color: #999;
+}
+
+.vc {
+  color: teal;
+}
+
+.vg {
+  color: teal;
+}
+
+.vi {
+  color: teal;
+}
+
+.il {
+  color: #099;
+}
+
+.gc {
+  color: #999;
+  background-color: #EAF2F5;
+}

docs/css/goreplay.css

@@ -0,0 +1,171 @@
+code {
+  font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace !important;
+  border-bottom-left-radius: 3px;
+  border-bottom-right-radius: 3px;
+  border-top-left-radius: 3px;
+  border-top-right-radius: 3px;
+  background-color: #f7f7f7 !important;
+  color: #333 !important;
+  font-size: 14px !important;
+  border: none !important;
+  padding: 5px !important;
+}
+
+pre > code {
+  line-height: 20px;
+  padding: 16px !important;
+}
+
+blockquote {
+  color: #777 !important;
+  border-left: 4px solid rgb(221, 221, 221);
+  padding-left: 16px;
+  padding-right: 16px;
+  margin-left: 0px !important;
+}
+
+/* Visited links purple is not a good idea */
+a:visited {
+  color: #008BF3;
+}
+
+a {
+  color: #008BF3;
+}
+
+h3, h4, h5, h6 {
+  color: #333 !important;
+}
+
+.rst-versions {
+  display: none !important;
+}
+
+/* The next and previous button we don't need */
+.rst-footer-buttons {
+  display: none;
+}
+
+/* Foldable parts */
+details > * {
+  margin-left: 20px;
+}
+details > summary {
+  margin-left: 0px; /* To overwrite the margin from above */
+
+  font-size: 120%;
+  cursor: pointer
+}
+
+/* Fix the design not having the correct spacing */
+.wy-menu-vertical .subnav li.current > a {
+  padding: 0.4045em 2.427em;
+}
+
+.toctree-l3 {
+  padding-left: 1.0em;
+}
+
+footer .fastlane {
+  margin: 20px 0;
+}
+
+footer .fastlane iframe {
+  vertical-align: middle;
+}
+
+/* Custom Syntax highlighting to look more like GitHub.com */
+.hljs-symbol {
+  color: #0086b3;
+}
+
+.hljs-keyword {
+  font-weight: normal;
+  color: #a71d5d;
+}
+
+.hljs-string {
+  color: #183691;
+}
+
+/* Header Anchors */
+/* From https://github.com/facelessuser/pymdown-extensions/blob/bf18d0635e9d91b0f98eacdcaa10f26e0ace0f20/doc_theme/css/theme_custom.css#L322-L395 */
+.rst-content .headeranchor-link {
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  display: block;
+  padding-right: 6px;
+  padding-left: 30px;
+  margin-left: -30px;
+}
+
+.rst-content .headeranchor-link:focus {
+  outline: none;
+}
+
+.rst-content h1,
+.rst-content h2,
+.rst-content h3,
+.rst-content h4,
+.rst-content h5,
+.rst-content h6 {
+  position: relative;
+}
+
+.rst-content h1 .headeranchor,
+.rst-content h2 .headeranchor,
+.rst-content h3 .headeranchor,
+.rst-content h4 .headeranchor,
+.rst-content h5 .headeranchor,
+.rst-content h6 .headeranchor {
+  display: none;
+  color: #000;
+  vertical-align: middle;
+}
+
+.rst-content h1:hover .headeranchor-link,
+.rst-content h2:hover .headeranchor-link,
+.rst-content h3:hover .headeranchor-link,
+.rst-content h4:hover .headeranchor-link,
+.rst-content h5:hover .headeranchor-link,
+.rst-content h6:hover .headeranchor-link {
+  height: 1em;
+  padding-left: 8px;
+  margin-left: -30px;
+  text-decoration: none;
+}
+
+.rst-content h1:hover .headeranchor-link .headeranchor,
+.rst-content h2:hover .headeranchor-link .headeranchor,
+.rst-content h3:hover .headeranchor-link .headeranchor,
+.rst-content h4:hover .headeranchor-link .headeranchor,
+.rst-content h5:hover .headeranchor-link .headeranchor,
+.rst-content h6:hover .headeranchor-link .headeranchor {
+  display: inline-block;
+}
+
+.rst-content .headeranchor {
+  font: normal normal 16px FontAwesome;
+  line-height: 1;
+  display: inline-block;
+  text-decoration: none;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+}
+
+.rst-content .headeranchor:before {
+  content: '\f0c1';
+}
+
+/* index.md badges */
+@media screen and (max-width: 768px) {
+  .badge img {
+    width: auto;
+  }
+}

docs/css/sidenav.css

@@ -0,0 +1,435 @@
+.wy-affix {
+  position: fixed;
+  top: 1.618em;
+}
+
+.wy-menu a:hover {
+  text-decoration: none;
+}
+
+.wy-menu-vertical header,
+.wy-menu-vertical p.caption {
+  height: 32px;
+  display: inline-block;
+  line-height: 32px;
+  padding: 0 1.618em;
+  margin-bottom: 0;
+  margin-top: 14px;
+  display: block;
+  font-weight: 700;
+  text-transform: uppercase;
+  font-size: 85%;
+  color: #ccc;
+  white-space: nowrap;
+}
+
+.wy-menu-vertical span {
+  color: #666;
+}
+
+.wy-menu-vertical ul {
+  margin-bottom: 0;
+}
+
+.wy-menu-vertical li.divide-top {
+  border-top: solid 1px #404040;
+}
+
+.wy-menu-vertical li.divide-bottom {
+  border-bottom: solid 1px #404040;
+}
+
+.wy-menu-vertical li.current {
+  background-color: #e5e5e5;
+}
+
+.wy-menu-vertical li.current a {
+  color: rgba(0, 93, 255, 0.7);
+  border-right: none;
+}
+
+.wy-menu-vertical li.current a:hover {
+  color: rgba(0, 93, 255, 0.9);
+}
+
+.wy-menu-vertical li code,
+.wy-menu-vertical li .rst-content tt,
+.rst-content .wy-menu-vertical li tt {
+  border: none;
+  background: inherit;
+  color: inherit;
+  padding-left: 0;
+  padding-right: 0
+}
+
+.wy-menu-vertical li span.toctree-expand {
+  display: block;
+  float: left;
+  margin-left: -1.2em;
+  font-size: .8em;
+  line-height: 1.6em;
+  color: #999;
+}
+
+.wy-menu-vertical li.on a,
+.wy-menu-vertical li.current>a {
+  color: rgba(0, 93, 255, 0.9);
+  font-weight: 700;
+  position: relative;
+  background: #fafafa;
+  border: none;
+}
+
+/*.wy-menu-vertical li.on a:hover span.toctree-expand,
+.wy-menu-vertical li.current>a:hover span.toctree-expand {
+  color: gray;
+}*/
+
+.wy-menu-vertical li.on a span.toctree-expand,
+.wy-menu-vertical li.current>a span.toctree-expand {
+  display: block;
+  font-size: .8em;
+  line-height: 1.6em;
+  color: #333;
+}
+
+.wy-menu-vertical li.toctree-l1.current li.toctree-l2>ul,
+.wy-menu-vertical li.toctree-l2.current li.toctree-l3>ul {
+  display: none;
+}
+
+.wy-menu-vertical li.toctree-l1.current li.toctree-l2.current>ul,
+.wy-menu-vertical li.toctree-l2.current li.toctree-l3.current>ul {
+  display: block;
+}
+
+.wy-menu-vertical li.toctree-l2.current li.toctree-l3>a {
+  display: block;
+  padding: .4045em 4.045em;
+}
+
+.wy-menu-vertical li.toctree-l2 a:hover span.toctree-expand {
+  color: #999;
+}
+
+.wy-menu-vertical li.toctree-l2 span.toctree-expand {
+  color: #999;
+}
+
+.wy-menu-vertical li.toctree-l3 {
+  background-color: #eee;
+  font-size: .9em;
+}
+
+.wy-menu-vertical li.toctree-l3.current>a {
+  padding: .4045em 4.045em;
+}
+
+.wy-menu-vertical li.toctree-l3.current li.toctree-l4>a {
+  display: block;
+  padding: .4045em 5.663em;
+  border-top: none;
+  border-bottom: none;
+}
+
+.wy-menu-vertical li.toctree-l3 a:hover span.toctree-expand {
+  color: rgba(0, 93, 255, 0.9);
+}
+
+.wy-menu-vertical li.toctree-l3 span.toctree-expand {
+  color: #999;
+}
+
+.wy-menu-vertical li.toctree-l4 {
+  font-size: .9em;
+}
+
+.wy-menu-vertical li.current ul {
+  display: block;
+}
+
+.wy-menu-vertical .local-toc li ul {
+  display: block;
+}
+
+.wy-menu-vertical li ul li a {
+  margin-bottom: 0;
+  color: rgba(0, 93, 255, 0.7);
+  font-weight: 400;
+}
+
+.wy-menu-vertical a {
+  display: inline-block;
+  line-height: 18px;
+  padding: .4045em 1.618em;
+  display: block;
+  position: relative;
+  font-size: 90%;
+  color: rgba(0, 93, 255, 0.7);
+}
+
+.wy-menu-vertical li.on a:hover,
+.wy-menu-vertical li.current>a:hover {
+  background-color: #fafafa;
+}
+
+.wy-menu-vertical a:hover {
+  color: rgba(0, 93, 255, 0.9);
+  cursor: pointer;
+  background-color: #fafafa;
+}
+
+.wy-menu-vertical a:hover span.toctree-expand {
+  color: rgba(0, 93, 255, 0.5);
+}
+
+.wy-menu-vertical a:active span.toctree-expand {
+  color: rgba(0, 93, 255, 0.7);
+}
+
+/* Search */
+
+.wy-side-nav-search {
+  z-index: 200;
+  background-color: #fafafa;
+  border-bottom: #333;
+  text-align: center;
+  padding: .809em;
+  display: block;
+  color: #333;
+  margin-bottom: .809em
+}
+
+.wy-side-nav-search input[type=text] {
+  width: 100%;
+  color: #333;
+  border-radius: 3px;
+  outline: 0;
+  padding: 10px;
+  background-color: #fff;
+  border: solid 1px #6d6d6d;
+  box-shadow: none
+}
+
+.wy-side-nav-search img {
+  display: block;
+  margin: auto auto .809em;
+  height: 45px;
+  width: 45px;
+  background-color: #2980B9;
+  padding: 5px;
+  border-radius: 100%
+}
+
+.wy-side-nav-search>a,
+.wy-side-nav-search .wy-dropdown>a {
+  color: #333;
+  font-size: 100%;
+  font-weight: 700;
+  display: inline-block;
+  padding: 4px 6px;
+  margin-bottom: .809em
+}
+
+.wy-side-nav-search>a:hover,
+.wy-side-nav-search .wy-dropdown>a:hover {
+  background: rgba(255,255,255,0.1)
+}
+
+.wy-side-nav-search>a img.logo,
+.wy-side-nav-search .wy-dropdown>a img.logo {
+  display: block;
+  margin: 0 auto;
+  height: auto;
+  width: auto;
+  border-radius: 0;
+  max-width: 100%;
+  background: transparent
+}
+
+.wy-side-nav-search>a.icon img.logo,
+.wy-side-nav-search .wy-dropdown>a.icon img.logo {
+  margin-top: .85em
+}
+
+.wy-nav .wy-menu-vertical header {
+  color: #2980B9
+}
+
+.wy-nav .wy-menu-vertical a {
+  color: #b3b3b3
+}
+
+.wy-nav .wy-menu-vertical a:hover {
+  background-color: #2980B9;
+  color: #fff
+}
+
+[data-menu-wrap] {
+  -webkit-transition: all .2s ease-in;
+  -moz-transition: all .2s ease-in;
+  transition: all .2s ease-in;
+  position: absolute;
+  opacity: 1;
+  width: 100%;
+  opacity: 0
+}
+
+[data-menu-wrap].move-center {
+  left: 0;
+  right: auto;
+  opacity: 1
+}
+
+[data-menu-wrap].move-left {
+  right: auto;
+  left: -100%;
+  opacity: 0
+}
+
+[data-menu-wrap].move-right {
+  right: -100%;
+  left: auto;
+  opacity: 0
+}
+
+.wy-body-for-nav {
+  background: left repeat-y #fcfcfc;
+  background-image: url(data:image/png;
+  base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyRpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoTWFjaW50b3NoKSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDoxOERBMTRGRDBFMUUxMUUzODUwMkJCOThDMEVFNURFMCIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDoxOERBMTRGRTBFMUUxMUUzODUwMkJCOThDMEVFNURFMCI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOjE4REExNEZCMEUxRTExRTM4NTAyQkI5OEMwRUU1REUwIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjE4REExNEZDMEUxRTExRTM4NTAyQkI5OEMwRUU1REUwIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+EwrlwAAAAA5JREFUeNpiMDU0BAgwAAE2AJgB9BnaAAAAAElFTkSuQmCC);
+  background-size: 300px 1px
+}
+
+.wy-grid-for-nav {
+  position: absolute;
+  width: 100%;
+  height: 100%
+}
+
+.wy-nav-side {
+  position: fixed;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  padding-bottom: 2em;
+  width: 300px;
+  overflow-x: hidden;
+  overflow-y: scroll;
+  min-height: 100%;
+  background-color: #fafafa;
+  z-index: 200;
+  border-right: 2px solid #eee;
+}
+
+.wy-nav-top {
+  display: none;
+  background-color: #333;
+  color: #fff;
+  padding: .4045em .809em;
+  position: relative;
+  line-height: 50px;
+  text-align: center;
+  font-size: 100%;
+  *zoom: 1
+}
+
+.wy-nav-top:before,
+.wy-nav-top:after {
+  display: table;
+  content: ""
+}
+
+.wy-nav-top:after {
+  clear: both
+}
+
+.wy-nav-top a {
+  color: #fff;
+  font-weight: 700
+}
+
+.wy-nav-top img {
+  margin-right: 12px;
+  height: 45px;
+  width: 45px;
+  background-color: #2980B9;
+  padding: 5px;
+  border-radius: 100%
+}
+
+.wy-nav-top i {
+  font-size: 30px;
+  line-height: 50px;
+  float: left;
+  cursor: pointer
+}
+
+.wy-nav-content-wrap {
+  margin-left: 300px;
+  background: #fcfcfc;
+  min-height: 100%
+}
+
+.wy-nav-content {
+  padding: 1.618em 3.236em;
+  height: 100%;
+  max-width: 1100px;
+  margin: auto
+}
+
+.wy-body-mask {
+  position: fixed;
+  width: 100%;
+  height: 100%;
+  background: rgba(0,0,0,0.2);
+  display: none;
+  z-index: 499
+}
+
+.wy-body-mask.on {
+  display: block
+}
+
+@media screen and (max-width: 768px) {
+  .wy-body-for-nav {
+    background: #fcfcfc
+  }
+
+  .wy-nav-top {
+    display: block
+  }
+
+  .wy-nav-side {
+    left: -300px
+  }
+
+  .wy-nav-side.shift {
+    width: 85%;
+    left: 0
+  }
+
+  .wy-nav-content-wrap {
+    margin-left: 0
+  }
+
+  .wy-nav-content-wrap .wy-nav-content {
+    padding: 1.618em
+  }
+
+  .wy-nav-content-wrap.shift {
+    position: fixed;
+    min-width: 100%;
+    left: 85%;
+    top: 0;
+    height: 100%;
+    overflow: hidden
+  }
+
+}
+
+@media screen and (min-width: 1400px) {
+  .wy-nav-content {
+    margin: 0;
+    background: #fcfcfc
+  }
+}

docs/getting-started/basics.md

@@ -0,0 +1,17 @@
+### Overview
+Gor architecture tries to follow UNIX philosophy: everything made of pipes, various inputs multiplexing data to outputs.
+
+You can [rate limit](/rate-limiting.md), [filter](request-filtering.md), [rewrite](request-rewriting.md) requests or even use your own [middleware](middleware.md) to implement custom logic. Also, it is possible to replay requests at the higher rate for [load testing](saving-and-replaying-from-file.md).
+
+### Available inputs
+
+* `--input-raw` - used to capture HTTP traffic, you should specify IP address or interface and application port. More about [[Capturing and replaying traffic]]. 
+* `--input-file` - accepts file which previously was recorded using ` --output-file`. More about [[Saving and Replaying from file]]
+* `--input-tcp` - used by Gor aggregation instance if you decided forward traffic from multiple forwarder Gor instances to it. Read about using [[Aggregator-forwarder setup]].
+
+### Available outputs
+
+* `--output-http` - replay HTTP traffic to given endpoint, accepts base url. Read [more about it](Replaying HTTP traffic)
+* `--output-file` - records incoming traffic to the file. More about [[Saving and Replaying from file]]
+* `--output-tcp` - forward incoming data to another Gor instance, used in conjunction with `--input-tcp`. Read more about [[Aggregator-forwarder setup]].
+* `--output-stdout` - used for debugging, outputs all data to stdout.

docs/getting-started/tutorial.md

@@ -0,0 +1,44 @@
+### Dependencies
+To start working with Gor, you need to have a web server running on your machine, and a terminal to run commands. If you are just poking around, you can quickly start the server by calling `gor file-server :8000`, this will start a simple file server of the current directory on port `8000`. 
+
+### Installing Gor
+Download the latest Gor binary from https://github.com/buger/gor/releases (we provide precompiled binaries for Windows, Linux x64 and Mac OS), or you can compile by yourself [[Compilation]].
+
+Once the archive is downloaded and uncompressed, you can run Gor from the current directory, or you may want to copy binary to your PATH (for Linux and Mac OS it can be `/usr/local/bin`).
+
+### Capturing web traffic
+Now run this command in terminal: `sudo ./gor --input-raw :8000 --output-stdout`
+
+This command says to listen for all network activity happening on port 8000 and log it to stdout.
+If you are familiar with `tcpdump`, we are going to implement similar functionality. 
+
+> You may notice that it uses `sudo` and asks for the password: to analyze network, Gor needs permissions which are available only to super users.
+> However, it is possible to configure Gor [being run for non-root users](Running-as-non-root-user).
+
+
+Make a few requests by opening `http://localhost:8000` in your browser, or just by calling curl in terminal `curl http://localhost:8000`. You should see that `gor` outputs all the HTTP requests and responses right to the terminal window where it is running. 
+
+
+**Gor is not a proxy:** you do not need to put 3-rd party tool to your critical path. Instead Gor just silently analyzes the traffic of your application and does not affect it anyhow.
+
+### Replaying
+
+Now it's time to replay your original traffic to another environment. Let's start the same file web server but on a different port: `gor file-server :8001`. 
+
+Instead of `--output-stdout` we will use `--output-http` and provide URL of second server: `sudo ./gor --input-raw :8000 --output-http="http://localhost:8001"`
+
+Make few requests to first server. You should see them replicated to the second one, voila! 
+
+### Saving requests to file and replaying them later
+Sometimes it's not possible to replay requests in real time; Gor allows you to save requests to the file and replay them later. 
+
+First use `--output-file` to save them: `sudo ./gor --input-raw :8000 --output-file=requests.gor`. This will create new file and continuously write all captured requests to it. 
+
+Let's re-run Gor, but now to replay requests from file: `./gor --input-file requests.gor --output-http="http://localhost:8001"`. You should see all the recorded requests coming to the second server, and they will be replayed in the same order and with exactly same timing as they were recorded.
+
+Next: [[The Basics]]
+
+### Watch an overview:
+
+
+![YOUTUBE](https://www.youtube.com/watch?v=CxuKZcMKaW4)

docs/index.md

@@ -0,0 +1,29 @@
+Gor is an open-source tool for capturing and replaying live HTTP traffic into a test environment in order to continuously test your system with real data. It can be used to increase confidence in code deployments, configuration changes and infrastructure changes.
+
+Read for more info:
+
+* [[Getting Started]]
+* [[The Basics]]
+* [[Capturing and replaying traffic]]
+* [[Replaying HTTP traffic]]
+* [[[PRO] Replaying Binary protocols]]
+* [[[PRO] Recording and replaying keep alive TCP sessions]]
+* [[Saving and Replaying from file]]
+* [Performance testing](https://github.com/buger/gor/wiki/Saving-and-Replaying-from-file#performance-testing)
+* [[Rate limiting]]
+* [[Request filtering]]
+* [[Request rewriting]]
+* [[Middleware]]
+* [[Distributed configuration]]
+* [[Exporting to ElasticSearch]]
+* [[FAQ]]
+* [[Troubleshooting]]
+
+## Commercial Aspects
+
+* [[Commercial Support]]
+* [[Commercial FAQ]]
+* [[Commercial collaboration]]
+
+
+Next: [Getting Started](Getting-Started)

docs/js/base.js

@@ -0,0 +1,7 @@
+$(document).ready(function () {
+    $('img[alt="YOUTUBE"]').each(function () {
+        var id = $(this).attr('src').split('/')[$(this).attr('src').split('/').length - 1].split("=")[1];
+        var video = '<iframe style="width: 100%;height: 450px;" src="https://www.youtube.com/embed/' + id + '" frameborder="0" allowfullscreen></iframe>';
+        $(this).replaceWith(video);
+    });
+});

docs/pro/recording-and-replaying-keep-alive-tcp-sessions.md

@@ -0,0 +1,11 @@
+> **This feature available only in PRO version. See https://goreplay.org/pro.html for details.**
+
+By default, GoReplay does not guarantee that when you record keep-alive TCP session, it will be replayed in the same TCP connection as well. This is ok for most of the cases, but it does not give an accurate number of TCP sessions while replaying, also may cause issues if your application state depends on TCP session (do not mess with HTTP session).
+
+[GoReplay PRO](https://goreplay.org/pro.html) extension adds support for accurate recording and replaying of keep-alive TCP sessions. Separate connection to your server is created per original session and it makes benchmarks and tests incredibly accurate. To enable session recognition you just need to pass `--recognize-tcp-sessions` option. 
+
+```
+gor --input-raw :80 --recognize-tcp-sessions --output-http http://test.target
+```
+
+Note that enabling this option also change algorithm of distributing traffic when using `--split-output`, see [Distributed configuration].

docs/pro/replaying-binary-protocols.md

@@ -0,0 +1,14 @@
+> **This feature available only in PRO version. See https://goreplay.org/pro.html for details.**
+
+Gor includes basic support for working with binary formats like `thrift` or `protocol-buffers`. To start set `--input-raw-protocol` to 'binary' (by default 'http'). For replaying, you should use `--output-binary`, example:
+
+```
+gor --input-raw :80 --input-raw-protocol binary --output-binary staging:8081
+```
+
+While working with `--input-raw` you may notice a 2-second delay before messages are emitted to the outputs. This behaviour is expected and happening because for general binary protocol it is impossible to know when TCP message ends, so Gor has to set inactivity timeout. Each protocol has own rules (for example write message length as first bytes), and require individual handling to know message length. We consider improving detailed protocol support for `thrift`, `protocol-buffer` and etc.
+
+Note that you can use all load testing features for binary protocols. For example, the following command will loop and replay recorded payload on 10x speed for 30 seconds:
+```
+gor --input-file './binary*.gor|1000%' --output-binary staging:9091 --input-file-loop --exit-after 30s
+```

elasticsearch.go

@@ -2,67 +2,81 @@ package main
 
 import (
 	"encoding/json"
-	"github.com/buger/elastigo/api"
-	"github.com/buger/elastigo/core"
-	"github.com/buger/gor/proto"
 	"log"
-	"regexp"
+	"net/url"
+	"strings"
+	//"regexp"
 	"time"
+
+	"github.com/buger/goreplay/proto"
+
+	"github.com/mattbaird/elastigo/lib"
 )
 
 type ESUriErorr struct{}
 
 func (e *ESUriErorr) Error() string {
-	return "Wrong ElasticSearch URL format. Expected to be: host:port/index_name"
+	return "Wrong ElasticSearch URL format. Expected to be: scheme://host/index_name"
 }
 
 type ESPlugin struct {
 	Active  bool
 	ApiPort string
+	eConn   *elastigo.Conn
 	Host    string
 	Index   string
-	indexor *core.BulkIndexer
+	indexor *elastigo.BulkIndexer
 	done    chan bool
 }
 
 type ESRequestResponse struct {
-	ReqUrl               []byte `json:"Req_URL"`
-	ReqMethod            []byte `json:"Req_Method"`
-	ReqUserAgent         []byte `json:"Req_User-Agent"`
-	ReqAcceptLanguage    []byte `json:"Req_Accept-Language,omitempty"`
-	ReqAccept            []byte `json:"Req_Accept,omitempty"`
-	ReqAcceptEncoding    []byte `json:"Req_Accept-Encoding,omitempty"`
-	ReqIfModifiedSince   []byte `json:"Req_If-Modified-Since,omitempty"`
-	ReqConnection        []byte `json:"Req_Connection,omitempty"`
-	ReqCookies           []byte `json:"Req_Cookies,omitempty"`
-	RespStatus           []byte `json:"Resp_Status"`
-	RespStatusCode       []byte `json:"Resp_Status-Code"`
-	RespProto            []byte `json:"Resp_Proto,omitempty"`
-	RespContentLength    []byte `json:"Resp_Content-Length,omitempty"`
-	RespContentType      []byte `json:"Resp_Content-Type,omitempty"`
-	RespTransferEncoding []byte `json:"Resp_Transfer-Encoding,omitempty"`
-	RespContentEncoding  []byte `json:"Resp_Content-Encoding,omitempty"`
-	RespExpires          []byte `json:"Resp_Expires,omitempty"`
-	RespCacheControl     []byte `json:"Resp_Cache-Control,omitempty"`
-	RespVary             []byte `json:"Resp_Vary,omitempty"`
-	RespSetCookie        []byte `json:"Resp_Set-Cookie,omitempty"`
+	ReqURL               string `json:"Req_URL"`
+	ReqMethod            string `json:"Req_Method"`
+	ReqUserAgent         string `json:"Req_User-Agent"`
+	ReqAcceptLanguage    string `json:"Req_Accept-Language,omitempty"`
+	ReqAccept            string `json:"Req_Accept,omitempty"`
+	ReqAcceptEncoding    string `json:"Req_Accept-Encoding,omitempty"`
+	ReqIfModifiedSince   string `json:"Req_If-Modified-Since,omitempty"`
+	ReqConnection        string `json:"Req_Connection,omitempty"`
+	ReqCookies           string `json:"Req_Cookies,omitempty"`
+	RespStatus           string `json:"Resp_Status"`
+	RespStatusCode       string `json:"Resp_Status-Code"`
+	RespProto            string `json:"Resp_Proto,omitempty"`
+	RespContentLength    string `json:"Resp_Content-Length,omitempty"`
+	RespContentType      string `json:"Resp_Content-Type,omitempty"`
+	RespTransferEncoding string `json:"Resp_Transfer-Encoding,omitempty"`
+	RespContentEncoding  string `json:"Resp_Content-Encoding,omitempty"`
+	RespExpires          string `json:"Resp_Expires,omitempty"`
+	RespCacheControl     string `json:"Resp_Cache-Control,omitempty"`
+	RespVary             string `json:"Resp_Vary,omitempty"`
+	RespSetCookie        string `json:"Resp_Set-Cookie,omitempty"`
 	Rtt                  int64  `json:"RTT"`
 	Timestamp            time.Time
 }
 
 // Parse ElasticSearch URI
 //
-// Proper format is: host:port/index_name
-func parseURI(URI string) (err error, host string, port string, index string) {
-	rURI := regexp.MustCompile("(.+):([0-9]+)/(.+)")
-	match := rURI.FindAllStringSubmatch(URI, -1)
+// Proper format is: scheme://[userinfo@]host/index_name
+// userinfo is: user[:password]
+// net/url.Parse() does not fail if scheme is not provided but actualy does not
+// handle URI properly.
+// So we must 'validate' URI format to match requirements to use net/url.Parse()
+func parseURI(URI string) (err error, index string) {
 
-	if len(match) == 0 {
+	parsedUrl, parseErr := url.Parse(URI)
+
+	if parseErr != nil {
+		err = new(ESUriErorr)
+	}
+
+	//	check URL validity by extracting host and undex values.
+	host := parsedUrl.Host
+	urlPathParts := strings.Split(parsedUrl.Path, "/")
+	index = urlPathParts[len(urlPathParts)-1]
+
+	// force index specification in uri : ie no implicit index
+	if host == "" || index == "" {
 		err = new(ESUriErorr)
-	} else {
-		host = match[0][1]
-		port = match[0][2]
-		index = match[0][3]
 	}
 
 	return
@@ -71,29 +85,32 @@ func parseURI(URI string) (err error, host string, port string, index string) {
 func (p *ESPlugin) Init(URI string) {
 	var err error
 
-	err, p.Host, p.ApiPort, p.Index = parseURI(URI)
+	err, p.Index = parseURI(URI)
 
 	if err != nil {
 		log.Fatal("Can't initialize ElasticSearch plugin.", err)
 	}
 
-	api.Domain = p.Host
-	api.Port = p.ApiPort
+	p.eConn = elastigo.NewConn()
 
-	p.indexor = core.NewBulkIndexerErrors(50, 60)
+	p.eConn.SetFromUrl(URI)
+
+	p.indexor = p.eConn.NewBulkIndexerErrors(50, 60)
 	p.done = make(chan bool)
-	p.indexor.Run(p.done)
+	p.indexor.Start()
 
-	// Only start the ErrorHandler goroutine when in verbose mode
-	// no need to burn ressources otherwise
-	// go p.ErrorHandler()
+	if Settings.verbose {
+		// Only start the ErrorHandler goroutine when in verbose mode
+		// no need to burn ressources otherwise
+		go p.ErrorHandler()
+	}
 
 	log.Println("Initialized Elasticsearch Plugin")
 	return
 }
 
 func (p *ESPlugin) IndexerShutdown() {
-	p.done <- true
+	p.indexor.Stop()
 	return
 }
 
@@ -118,28 +135,29 @@ func (p *ESPlugin) ResponseAnalyze(req, resp []byte, start, stop time.Time) {
 	}
 	t := time.Now()
 	rtt := p.RttDurationToMs(stop.Sub(start))
+	req = payloadBody(req)
 
 	esResp := ESRequestResponse{
-		ReqUrl:               proto.Path(req),
-		ReqMethod:            proto.Method(req),
-		ReqUserAgent:         proto.Header(req, []byte("User-Agent")),
-		ReqAcceptLanguage:    proto.Header(req, []byte("Accept-Language")),
-		ReqAccept:            proto.Header(req, []byte("Accept")),
-		ReqAcceptEncoding:    proto.Header(req, []byte("Accept-Encoding")),
-		ReqIfModifiedSince:   proto.Header(req, []byte("If-Modified-Since")),
-		ReqConnection:        proto.Header(req, []byte("Connection")),
-		ReqCookies:           proto.Header(req, []byte("Cookie")),
-		RespStatus:           proto.Status(resp),
-		RespStatusCode:       proto.Status(resp),
-		RespProto:            proto.Method(resp),
-		RespContentLength:    proto.Header(resp, []byte("Content-Length")),
-		RespContentType:      proto.Header(resp, []byte("Content-Type")),
-		RespTransferEncoding: proto.Header(resp, []byte("Transfer-Encoding")),
-		RespContentEncoding:  proto.Header(resp, []byte("Content-Encoding")),
-		RespExpires:          proto.Header(resp, []byte("Expires")),
-		RespCacheControl:     proto.Header(resp, []byte("Cache-Control")),
-		RespVary:             proto.Header(resp, []byte("Vary")),
-		RespSetCookie:        proto.Header(resp, []byte("Set-Cookie")),
+		ReqURL:               string(proto.Path(req)),
+		ReqMethod:            string(proto.Method(req)),
+		ReqUserAgent:         string(proto.Header(req, []byte("User-Agent"))),
+		ReqAcceptLanguage:    string(proto.Header(req, []byte("Accept-Language"))),
+		ReqAccept:            string(proto.Header(req, []byte("Accept"))),
+		ReqAcceptEncoding:    string(proto.Header(req, []byte("Accept-Encoding"))),
+		ReqIfModifiedSince:   string(proto.Header(req, []byte("If-Modified-Since"))),
+		ReqConnection:        string(proto.Header(req, []byte("Connection"))),
+		ReqCookies:           string(proto.Header(req, []byte("Cookie"))),
+		RespStatus:           string(proto.Status(resp)),
+		RespStatusCode:       string(proto.Status(resp)),
+		RespProto:            string(proto.Method(resp)),
+		RespContentLength:    string(proto.Header(resp, []byte("Content-Length"))),
+		RespContentType:      string(proto.Header(resp, []byte("Content-Type"))),
+		RespTransferEncoding: string(proto.Header(resp, []byte("Transfer-Encoding"))),
+		RespContentEncoding:  string(proto.Header(resp, []byte("Content-Encoding"))),
+		RespExpires:          string(proto.Header(resp, []byte("Expires"))),
+		RespCacheControl:     string(proto.Header(resp, []byte("Cache-Control"))),
+		RespVary:             string(proto.Header(resp, []byte("Vary"))),
+		RespSetCookie:        string(proto.Header(resp, []byte("Set-Cookie"))),
 		Rtt:                  rtt,
 		Timestamp:            t,
 	}
@@ -147,7 +165,7 @@ func (p *ESPlugin) ResponseAnalyze(req, resp []byte, start, stop time.Time) {
 	if err != nil {
 		log.Println(err)
 	} else {
-		p.indexor.Index(p.Index, "RequestResponse", "", "", &t, j, true)
+		p.indexor.Index(p.Index, "RequestResponse", "", "", "", &t, j)
 	}
 	return
 }

elasticsearch_test.go

@@ -0,0 +1,140 @@
+package main
+
+import (
+	"testing"
+)
+
+const expectedIndex = "gor"
+
+func assertExpectedGorIndex(index string, t *testing.T) {
+	if expectedIndex != index {
+		t.Fatalf("Expected index %s but got %s", expectedIndex, index)
+	}
+}
+
+func assertExpectedIndex(expectedIndex string, index string, t *testing.T) {
+	if expectedIndex != index {
+		t.Fatalf("Expected index %s but got %s", expectedIndex, index)
+	}
+}
+
+func assertExpectedError(returnedError error, t *testing.T) {
+	expectedError := new(ESUriErorr)
+
+	if expectedError != returnedError {
+		t.Errorf("Expected err %s but got %s", expectedError, returnedError)
+	}
+}
+
+func assertNoError(returnedError error, t *testing.T) {
+	if nil != returnedError {
+		t.Errorf("Expected no err but got %s", returnedError)
+	}
+}
+
+// Argument host:port/index_name
+// i.e : localhost:9200/gor
+// Fail because scheme is mandatory
+func TestElasticConnectionBuildFailWithoutScheme(t *testing.T) {
+	uri := "localhost:9200/" + expectedIndex
+
+	err, _ := parseURI(uri)
+	assertExpectedError(err, t)
+}
+
+// Argument scheme://host:port
+// i.e : http://localhost:9200
+// Fail : explicit index is required
+func TestElasticConnectionBuildFailWithoutIndex(t *testing.T) {
+	uri := "http://localhost:9200"
+
+	err, index := parseURI(uri)
+
+	assertExpectedIndex("", index, t)
+
+	assertExpectedError(err, t)
+}
+
+// Argument scheme://host/index_name
+// i.e : http://localhost/gor
+func TestElasticConnectionBuildFailWithoutPort(t *testing.T) {
+	uri := "http://localhost/" + expectedIndex
+
+	err, index := parseURI(uri)
+
+	assertNoError(err, t)
+
+	assertExpectedGorIndex(index, t)
+}
+
+// Argument scheme://host:port/index_name
+// i.e : http://localhost:9200/gor
+func TestElasticLocalConnectionBuild(t *testing.T) {
+	uri := "http://localhost:9200/" + expectedIndex
+
+	err, index := parseURI(uri)
+
+	assertNoError(err, t)
+
+	assertExpectedGorIndex(index, t)
+}
+
+// Argument scheme://host:port/index_name
+// i.e : http://localhost.local:9200/gor or https://localhost.local:9200/gor
+func TestElasticSimpleLocalWithSchemeConnectionBuild(t *testing.T) {
+	uri := "http://localhost.local:9200/" + expectedIndex
+
+	err, index := parseURI(uri)
+
+	assertNoError(err, t)
+
+	assertExpectedGorIndex(index, t)
+}
+
+// Argument scheme://host:port/index_name
+// i.e : http://localhost.local:9200/gor or https://localhost.local:9200/gor
+func TestElasticSimpleLocalWithHTTPSConnectionBuild(t *testing.T) {
+	uri := "https://localhost.local:9200/" + expectedIndex
+
+	err, index := parseURI(uri)
+
+	assertNoError(err, t)
+
+	assertExpectedGorIndex(index, t)
+}
+
+// Argument scheme://host:port/index_name
+// i.e : localhost.local:9200/pathtoElastic/gor
+func TestElasticLongPathConnectionBuild(t *testing.T) {
+	uri := "http://localhost.local:9200/pathtoElastic/" + expectedIndex
+
+	err, index := parseURI(uri)
+
+	assertNoError(err, t)
+
+	assertExpectedGorIndex(index, t)
+}
+
+// Argument scheme://host:userinfo@port/index_name
+// i.e : http://user:password@localhost.local:9200/gor
+func TestElasticBasicAuthConnectionBuild(t *testing.T) {
+	uri := "http://user:password@localhost.local:9200/" + expectedIndex
+
+	err, index := parseURI(uri)
+
+	assertNoError(err, t)
+
+	assertExpectedGorIndex(index, t)
+}
+
+// Argument scheme://host:port/path/index_name
+// i.e : http://localhost.local:9200/path/gor or https://localhost.local:9200/path/gor
+func TestElasticComplexPathConnectionBuild(t *testing.T) {
+	uri := "http://localhost.local:9200/path/" + expectedIndex
+
+	err, index := parseURI(uri)
+
+	assertNoError(err, t)
+
+	assertExpectedGorIndex(index, t)
+}

emitter.go

@@ -3,6 +3,7 @@ package main
 import (
 	"bytes"
 	"io"
+	"log"
 	"time"
 )
 
@@ -15,30 +16,45 @@ func Start(stop chan int) {
 			middleware.ReadFrom(in)
 		}
 
-		// We going only to read responses, so using same ReadFrom method
+		// We are going only to read responses, so using same ReadFrom method
 		for _, out := range Plugins.Outputs {
 			if r, ok := out.(io.Reader); ok {
 				middleware.ReadFrom(r)
 			}
 		}
 
-		go CopyMulty(middleware, Plugins.Outputs...)
+		go func() {
+			if err := CopyMulty(middleware, Plugins.Outputs...); err != nil {
+				log.Println("Error during copy: ", err)
+				close(stop)
+			}
+		}()
 	} else {
 		for _, in := range Plugins.Inputs {
-			go CopyMulty(in, Plugins.Outputs...)
+			go func() {
+				if err := CopyMulty(in, Plugins.Outputs...); err != nil {
+					log.Println("Error during copy: ", err)
+					close(stop)
+				}
+			}()
+		}
+
+		for _, out := range Plugins.Outputs {
+			if r, ok := out.(io.Reader); ok {
+				go func() {
+					if err := CopyMulty(r, Plugins.Outputs...); err != nil {
+						log.Println("Error during copy: ", err)
+						close(stop)
+					}
+				}()
+			}
 		}
 	}
 
 	for {
 		select {
 		case <-stop:
-			pluginMu.Lock()
-			for _, p := range Plugins.All {
-				if cp, ok := p.(io.Closer); ok {
-					cp.Close()
-				}
-			}
-			pluginMu.Unlock()
+			finalize()
 			return
 		case <-time.After(100 * time.Millisecond):
 		}
@@ -47,48 +63,87 @@ func Start(stop chan int) {
 
 // CopyMulty copies from 1 reader to multiple writers
 func CopyMulty(src io.Reader, writers ...io.Writer) (err error) {
-	buf := make([]byte, 5*1024*1024)
+	buf := make([]byte, Settings.copyBufferSize)
 	wIndex := 0
 	modifier := NewHTTPModifier(&Settings.modifierConfig)
+	filteredRequests := make(map[string]time.Time)
+	filteredRequestsLastCleanTime := time.Now()
+
+	i := 0
 
 	for {
 		nr, er := src.Read(buf)
 
+		if er == io.EOF {
+			return nil
+		}
+		if er != nil {
+			return err
+		}
+
+		_maxN := nr
+		if nr > 500 {
+			_maxN = 500
+		}
 		if nr > 0 && len(buf) > nr {
 			payload := buf[:nr]
+			meta := payloadMeta(payload)
+			if len(meta) < 3 {
+				if Settings.debug {
+					Debug("[EMITTER] Found malformed record", string(payload[0:_maxN]), nr, "from:", src)
+				}
+				continue
+			}
+			requestID := string(meta[1])
 
-			_maxN := nr
-			if nr > 500 {
-				_maxN = 500
+			if nr >= 5*1024*1024 {
+				log.Println("INFO: Large packet... We received ", len(payload), " bytes from ", src)
 			}
 
 			if Settings.debug {
 				Debug("[EMITTER] input:", string(payload[0:_maxN]), nr, "from:", src)
 			}
 
-			if modifier != nil && isRequestPayload(payload) {
-				headSize := bytes.IndexByte(payload, '\n') + 1
-				body := payload[headSize:]
-				originalBodyLen := len(body)
-				body = modifier.Rewrite(body)
+			if modifier != nil {
+				if isRequestPayload(payload) {
+					headSize := bytes.IndexByte(payload, '\n') + 1
+					body := payload[headSize:]
+					originalBodyLen := len(body)
+					body = modifier.Rewrite(body)
 
-				// If modifier tells to skip request
-				if len(body) == 0 {
+					// If modifier tells to skip request
+					if len(body) == 0 {
+						filteredRequests[requestID] = time.Now()
+						continue
+					}
+
+					if originalBodyLen != len(body) {
+						payload = append(payload[:headSize], body...)
+					}
+
+					if Settings.debug {
+						Debug("[EMITTER] Rewritten input:", len(payload), "First 500 bytes:", string(payload[0:_maxN]))
+					}
+				} else {
+					if _, ok := filteredRequests[requestID]; ok {
+						delete(filteredRequests, requestID)
+						continue
+					}
+				}
+			}
+
+			if Settings.prettifyHTTP {
+				payload = prettifyHTTP(payload)
+				if len(payload) == 0 {
 					continue
 				}
-
-				if originalBodyLen != len(body) {
-					payload = append(payload[:headSize], body...)
-				}
-
-				if Settings.debug {
-					Debug("[EMITTER] Rewrittern input:", len(payload), "First 500 bytes:", string(payload[0:_maxN]))
-				}
 			}
 
 			if Settings.splitOutput {
 				// Simple round robin
-				writers[wIndex].Write(payload)
+				if _, err := writers[wIndex].Write(payload); err != nil {
+					return err
+				}
 
 				wIndex++
 
@@ -97,18 +152,31 @@ func CopyMulty(src io.Reader, writers ...io.Writer) (err error) {
 				}
 			} else {
 				for _, dst := range writers {
-					dst.Write(payload)
+					if _, err := dst.Write(payload); err != nil {
+						return err
+					}
 				}
 			}
+		} else if nr > 0 {
+			log.Println("WARN: Packet", nr, "bytes is too large to process. Consider increasing --copy-buffer-size")
+		}
 
+		// Run GC on each 1000 request
+		if i%1000 == 0 {
+			// Clean up filtered requests for which we didn't get a response to filter
+			now := time.Now()
+			if now.Sub(filteredRequestsLastCleanTime) > 60*time.Second {
+				for k, v := range filteredRequests {
+					if now.Sub(v) > 60*time.Second {
+						delete(filteredRequests, k)
+					}
+				}
+				filteredRequestsLastCleanTime = time.Now()
+			}
 		}
-		if er == io.EOF {
-			break
-		}
-		if er != nil {
-			err = er
-			break
-		}
+
+		i++
 	}
+
 	return err
 }

emitter_test.go

@@ -5,6 +5,7 @@ import (
 	"sync"
 	"sync/atomic"
 	"testing"
+	"time"
 )
 
 func TestEmitter(t *testing.T) {
@@ -31,6 +32,53 @@ func TestEmitter(t *testing.T) {
 	close(quit)
 }
 
+func TestEmitterFiltered(t *testing.T) {
+	wg := new(sync.WaitGroup)
+	quit := make(chan int)
+
+	input := NewTestInput()
+	input.skipHeader = true
+
+	output := NewTestOutput(func(data []byte) {
+		wg.Done()
+	})
+
+	Plugins.Inputs = []io.Reader{input}
+	Plugins.Outputs = []io.Writer{output}
+	methods := HTTPMethods{[]byte("GET")}
+	Settings.modifierConfig = HTTPModifierConfig{methods: methods}
+
+	go Start(quit)
+
+	wg.Add(2)
+
+	id := uuid()
+	reqh := payloadHeader(RequestPayload, id, time.Now().UnixNano(), -1)
+	reqb := append(reqh, []byte("GET / HTTP/1.1\r\nHost: www.w3.org\r\nUser-Agent: Go 1.1 package http\r\nAccept-Encoding: gzip\r\n\r\n")...)
+
+	resh := payloadHeader(ResponsePayload, id, time.Now().UnixNano()+1, 1)
+	respb := append(resh, []byte("HTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n")...)
+
+	input.EmitBytes(reqb)
+	input.EmitBytes(respb)
+
+	id = uuid()
+	reqh = payloadHeader(RequestPayload, id, time.Now().UnixNano(), -1)
+	reqb = append(reqh, []byte("POST / HTTP/1.1\r\nHost: www.w3.org\r\nUser-Agent: Go 1.1 package http\r\nAccept-Encoding: gzip\r\n\r\n")...)
+
+	resh = payloadHeader(ResponsePayload, id, time.Now().UnixNano()+1, 1)
+	respb = append(resh, []byte("HTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n")...)
+
+	input.EmitBytes(reqb)
+	input.EmitBytes(respb)
+
+	wg.Wait()
+
+	close(quit)
+
+	Settings.modifierConfig = HTTPModifierConfig{}
+}
+
 func TestEmitterRoundRobin(t *testing.T) {
 	wg := new(sync.WaitGroup)
 	quit := make(chan int)

examples/middleware/echo.clj

@@ -0,0 +1,53 @@
+(ns echo.core
+  (:gen-class)
+  (:require [clojure.string :as cs]
+            [clojure.java.io :as io])
+  (:import org.apache.commons.codec.binary.Hex
+           java.io.BufferedReader
+           java.io.IOException
+           java.io.InputStreamReader))
+
+
+(defn transform-http-msg
+  "Function that transforms/filters the incoming HTTP messages."
+  [headers body]
+  ;; do actual transformations here
+  [headers body])
+
+
+(defn decode-hex-string
+  "Decode an Hex-encoded string."
+  [s]
+  (String. (Hex/decodeHex (.toCharArray s))))
+
+
+(defn encode-hex-string
+  "Encode a string to a hex-encoded string."
+  [^String s]
+  (String. (Hex/encodeHex (.getBytes s))))
+
+
+(defn -main
+  [& args]
+  (let [br (BufferedReader. (InputStreamReader. System/in))]
+    (try
+      (loop [hex-line (.readLine br)]
+        (let [decoded-req (decode-hex-string hex-line)
+
+              ;; empty line separates headers from body
+              http-request (partition-by empty? (cs/split-lines decoded-req))
+              headers (first http-request)
+
+              ;; HTTP messages can contain no body:
+              body (when (= 3 (count http-request)) (last http-request))
+              [new-headers new-body] (transform-http-msg headers body)]
+
+          (println (encode-hex-string (str (cs/join "\n" headers)
+                                           (when body
+                                             (str "\n\n"
+                                                  (cs/join "\n" body)))))))
+        (when-let [line (.readLine br)]
+          (recur line)))
+      (catch IOException e nil))))
+
+

examples/middleware/echo.java

@@ -2,8 +2,25 @@ import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 
-public class echo {
-    public static void main(String[] args) {
+import org.apache.commons.codec.DecoderException;
+import org.apache.commons.codec.binary.Hex;
+
+
+class Echo {
+    public static String decodeHexString(String s) throws DecoderException {
+        return new String(Hex.decodeHex(s.toCharArray()));
+    }
+
+    public static String encodeHexString(String s) {
+        return new String(Hex.encodeHex(s.getBytes()));
+    }
+
+    public static String transformHTTPMessage(String req) {
+        // do actual transformations here
+        return req;
+    }
+
+    public static void main(String[] args) throws DecoderException {
         if(args != null){
             for(String arg : args){
                 System.out.println(arg);
@@ -12,16 +29,20 @@ public class echo {
         }
 
         BufferedReader stdin = new BufferedReader(new InputStreamReader(
-                System.in));
+                                                                        System.in));
         String line = null;
 
         try {
             while ((line = stdin.readLine()) != null) {
+                String decodedLine = decodeHexString(line);
 
-                System.out.println(line);
+                String transformedLine = transformHTTPMessage(decodedLine);
+
+                String encodedLine = encodeHexString(transformedLine);
+                System.out.println(encodedLine);
 
             }
         } catch (IOException e) {
         }
     }
-}
+}

examples/middleware/echo.js

@@ -0,0 +1,57 @@
+#!/usr/bin/env node
+const readline = require("readline");
+const StringDecoder = require("string_decoder").StringDecoder
+
+const rl = readline.createInterface({
+  input: process.stdin
+});
+
+var ignoreIds = new Set();
+var ignoreAddresses = "/api";
+const decoder = new StringDecoder("utf8");
+
+function convertHexString(hex) {
+  var bytes = [];
+  for (var i = 0; i < hex.length - 1; i += 2) {
+    bytes.push(parseInt(hex.substr(i, 2), 16));
+  }
+  return decoder.write(Buffer.from(bytes));
+}
+
+function log(output) {
+	console.error("===================");
+	console.error(output);
+}
+
+function shouldOutputLine(request) {
+  const components = request.split("\n");
+  const header = components[0].split(" ");
+  const type = parseInt(header[0]);
+  const tag = header[1];
+
+  if (type === 3) {
+    return true;
+  }
+  if (type === 1) {
+    // Check if it's oauth
+    const endpoint = components[1].split(" ")[1];
+    if (!endpoint.startsWith(ignoreAddresses)) {
+      ignoreIds.add(tag);
+      return false;
+    }
+  } else if (type === 2) {
+    if (ignoreIds.has(tag)) {
+      ignoreIds.delete(tag);
+      return false;
+    }
+  }
+  return true;
+}
+
+rl.on("line", (input) => {
+  const str = convertHexString(input);
+  console.log(input);
+  if (shouldOutputLine(str)) {
+    log(str);
+	}
+});

examples/middleware/echo.py

@@ -0,0 +1,76 @@
+#! /usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+import sys
+import fileinput
+import binascii
+
+# Used to find end of the Headers section
+EMPTY_LINE = b'\r\n\r\n'
+
+
+def log(msg):
+    """
+    Logging to STDERR as STDOUT and STDIN used for data transfer
+    @type msg: str or byte string
+    @param msg: Message to log to STDERR
+    """
+    try:
+        msg = str(msg) + '\n'
+    except:
+        pass
+    sys.stderr.write(msg)
+    sys.stderr.flush()
+
+
+def find_end_of_headers(byte_data):
+    """
+    Finds where the header portion ends and the content portion begins.
+    @type byte_data: str or byte string
+    @param byte_data: Hex decoded req or resp string
+    """
+    return byte_data.index(EMPTY_LINE) + 4
+
+
+def process_stdin():
+    """
+    Process STDIN and output to STDOUT
+    """
+    for raw_line in fileinput.input():
+
+        line = raw_line.rstrip()
+
+        # Decode base64 encoded line
+        decoded = bytes.fromhex(line)
+
+        # Split into metadata and payload, the payload is headers + body
+        (raw_metadata, payload) = decoded.split(b'\n', 1)
+
+        # Split into headers and payload
+        headers_pos = find_end_of_headers(payload)
+        raw_headers = payload[:headers_pos]
+        raw_content = payload[headers_pos:]
+
+        log('===================================')
+        request_type_id = int(raw_metadata.split(b' ')[0])
+        log('Request type: {}'.format({
+          1: 'Request',
+          2: 'Original Response',
+          3: 'Replayed Response'
+        }[request_type_id]))
+        log('===================================')
+
+        log('Original data:')
+        log(line)
+
+        log('Decoded request:')
+        log(decoded)
+
+        encoded = binascii.hexlify(raw_metadata + b'\n' + raw_headers + raw_content).decode('ascii')
+        log('Encoded data:')
+        log(encoded)
+
+        sys.stdout.write(encoded + '\n')
+
+if __name__ == '__main__':
+    process_stdin()

examples/middleware/echo.rb

@@ -1,12 +1,12 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
-while data = STDIN.gets # continiously read line from STDIN
+while data = STDIN.gets # continuously read line from STDIN
   next unless data
   data = data.chomp # remove end of line symbol
   
   decoded = [data].pack("H*") # decode base64 encoded request
   
-  # dedoded value is raw HTTP payload, example:
+  # decoded value is raw HTTP payload, example:
   #   
   #   POST /post HTTP/1.1
   #   Content-Length: 7

examples/middleware/token_modifier.go

@@ -24,8 +24,9 @@ import (
 	"bytes"
 	"encoding/hex"
 	"fmt"
-	"github.com/buger/gor/proto"
 	"os"
+
+	"github.com/buger/goreplay/proto"
 )
 
 // requestID -> originalToken

gor.go

@@ -9,6 +9,7 @@ import (
 	"log"
 	"net/http"
 	"net/http/httputil"
+	_ "net/http/pprof"
 	"os"
 	"os/signal"
 	"runtime"
@@ -32,7 +33,10 @@ func loggingMiddleware(next http.Handler) http.Handler {
 	})
 }
 
+var closeCh chan int
+
 func main() {
+	closeCh = make(chan int)
 	// // Don't exit on panic
 	// defer func() {
 	// 	if r := recover(); r != nil {
@@ -52,7 +56,7 @@ func main() {
 		}
 		dir, _ := os.Getwd()
 
-		log.Println("Started example file server for current dirrectory on address ", args[1])
+		log.Println("Started example file server for current directory on address ", args[1])
 
 		log.Fatal(http.ListenAndServe(args[1], loggingMiddleware(http.FileServer(http.Dir(dir)))))
 	} else {
@@ -74,21 +78,38 @@ func main() {
 		profileCPU(*cpuprofile)
 	}
 
+	if Settings.pprof != "" {
+		go func() {
+			log.Println(http.ListenAndServe(Settings.pprof, nil))
+		}()
+	}
+
 	c := make(chan os.Signal, 1)
 	signal.Notify(c, os.Interrupt, syscall.SIGTERM)
 	go func() {
 		<-c
-
-		for _, p := range Plugins.All {
-			if cp, ok := p.(io.Closer); ok {
-				cp.Close()
-			}
-		}
-
+		finalize()
 		os.Exit(1)
 	}()
 
-	Start(nil)
+	if Settings.exitAfter > 0 {
+		log.Println("Running gor for a duration of", Settings.exitAfter)
+
+		time.AfterFunc(Settings.exitAfter, func() {
+			log.Println("Stopping gor after", Settings.exitAfter)
+			close(closeCh)
+		})
+	}
+
+	Start(closeCh)
+}
+
+func finalize() {
+	for _, p := range Plugins.All {
+		if cp, ok := p.(io.Closer); ok {
+			cp.Close()
+		}
+	}
 }
 
 func profileCPU(cpuprofile string) {

gor_stat.go

@@ -7,21 +7,19 @@ import (
 	"time"
 )
 
-const (
-	rate = 5
-)
-
 type GorStat struct {
 	statName string
+	rateMs   int
 	latest   int
 	mean     int
 	max      int
 	count    int
 }
 
-func NewGorStat(statName string) (s *GorStat) {
+func NewGorStat(statName string, rateMs int) (s *GorStat) {
 	s = new(GorStat)
 	s.statName = statName
+	s.rateMs = rateMs
 	s.latest = 0
 	s.mean = 0
 	s.max = 0
@@ -40,7 +38,7 @@ func (s *GorStat) Write(latest int) {
 			s.max = latest
 		}
 		if latest != 0 {
-			s.mean = (s.mean + latest) / 2
+			s.mean = ((s.mean * s.count) + latest) / (s.count + 1)
 		}
 		s.latest = latest
 		s.count = s.count + 1
@@ -55,13 +53,13 @@ func (s *GorStat) Reset() {
 }
 
 func (s *GorStat) String() string {
-	return s.statName + ":" + strconv.Itoa(s.latest) + "," + strconv.Itoa(s.mean) + "," + strconv.Itoa(s.max) + "," + strconv.Itoa(s.count) + "," + strconv.Itoa(s.count/rate) + "," + strconv.Itoa(runtime.NumGoroutine())
+	return s.statName + ":" + strconv.Itoa(s.latest) + "," + strconv.Itoa(s.mean) + "," + strconv.Itoa(s.max) + "," + strconv.Itoa(s.count) + "," + strconv.Itoa(s.count/(s.rateMs/1000.0)) + "," + strconv.Itoa(runtime.NumGoroutine())
 }
 
 func (s *GorStat) reportStats() {
 	for {
 		log.Println(s)
 		s.Reset()
-		time.Sleep(rate * time.Second)
+		time.Sleep(time.Duration(s.rateMs) * time.Millisecond)
 	}
 }

http_client.go

@@ -1,11 +1,15 @@
 package main
 
 import (
+	"bufio"
 	"bytes"
 	"crypto/tls"
+	"encoding/base64"
 	"io"
 	"log"
 	"net"
+	"net/http"
+	"net/http/httputil"
 	"net/url"
 	"runtime/debug"
 	"strconv"
@@ -14,7 +18,7 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/buger/gor/proto"
+	"github.com/buger/goreplay/proto"
 )
 
 var httpMu sync.Mutex
@@ -38,15 +42,20 @@ type HTTPClientConfig struct {
 	ConnectionTimeout  time.Duration
 	Timeout            time.Duration
 	ResponseBufferSize int
+	CompatibilityMode  bool
 }
 
 type HTTPClient struct {
 	baseURL        string
 	scheme         string
 	host           string
+	auth           string
 	conn           net.Conn
+	proxy          *url.URL
+	proxyAuth      string
 	respBuf        []byte
 	config         *HTTPClientConfig
+	goClient       *http.Client
 	redirectsCount int
 }
 
@@ -56,14 +65,9 @@ func NewHTTPClient(baseURL string, config *HTTPClientConfig) *HTTPClient {
 	}
 
 	u, _ := url.Parse(baseURL)
-	if !strings.Contains(u.Host, ":") {
-		if u.Scheme != "http" {
-			u.Host += ":" + defaultPorts[u.Scheme]
-		}
-	}
 
-	if config.Timeout.Nanoseconds() == 0 {
-		config.Timeout = 5 * time.Second
+	if config.Timeout == 0 {
+		config.Timeout = time.Second
 	}
 
 	config.ConnectionTimeout = config.Timeout
@@ -79,26 +83,93 @@ func NewHTTPClient(baseURL string, config *HTTPClientConfig) *HTTPClient {
 	client.respBuf = make([]byte, config.ResponseBufferSize)
 	client.config = config
 
+	if config.CompatibilityMode {
+		client.goClient = &http.Client{
+			// #TODO
+			// CheckRedirect: redirectPolicyFunc,
+		}
+	}
+
+	if u.User != nil {
+		client.auth = "Basic " + base64.StdEncoding.EncodeToString([]byte(u.User.String()))
+	}
+
+	client.proxy, _ = http.ProxyFromEnvironment(&http.Request{URL: u})
+
+	if client.isProxy() && client.proxy.User != nil {
+		client.proxyAuth = "Basic " + base64.StdEncoding.EncodeToString([]byte(client.proxy.User.String()))
+	}
+
 	return client
 }
 
 func (c *HTTPClient) Connect() (err error) {
 	c.Disconnect()
 
+	var toDial string
 	if !strings.Contains(c.host, ":") {
-		c.conn, err = net.DialTimeout("tcp", c.host+":80", c.config.ConnectionTimeout)
+		toDial = c.host + ":" + defaultPorts[c.scheme]
 	} else {
-		c.conn, err = net.DialTimeout("tcp", c.host, c.config.ConnectionTimeout)
+		toDial = c.host
+	}
+
+	if c.isProxy() {
+		if c.proxy.Scheme != "http" {
+			panic("Unsupported HTTP Proxy method")
+		}
+		Debug("[HTTPClient] Connecting to proxy", c.proxy.String(), "<>", toDial)
+		c.conn, err = net.DialTimeout("tcp", c.proxy.Host, c.config.ConnectionTimeout)
+		if err != nil {
+			return
+		}
+		if c.scheme == "https" {
+			c.conn.Write([]byte("CONNECT " + toDial + " HTTP/1.1\r\n"))
+			if c.proxyAuth != "" {
+				c.conn.Write([]byte("Proxy-Authorization: " + c.proxyAuth + "\r\n"))
+			}
+			c.conn.Write([]byte("\r\n"))
+			br := bufio.NewReader(c.conn)
+			l, _, err := br.ReadLine()
+			if err != nil {
+				return err
+			}
+			if len(l) < 12 {
+				panic("HTTP proxy did not respond correctly")
+			}
+			status := l[9:12]
+			if !bytes.Equal(status, []byte("200")) {
+				panic("HTTP proxy did not respond correctly")
+			}
+			for {
+				// Read until we find the empty line
+				l, _, err := br.ReadLine()
+				if err != nil {
+					return err
+				}
+				if len(l) == 0 {
+					break
+				}
+			}
+		}
+		Debug("[HTTPClient] Proxy successfully connected")
+	} else {
+		c.conn, err = net.DialTimeout("tcp", toDial, c.config.ConnectionTimeout)
+		if err != nil {
+			return
+		}
 	}
 
 	if c.scheme == "https" {
-		tlsConn := tls.Client(c.conn, &tls.Config{InsecureSkipVerify: true})
+		// Wrap our socket in TLS
+		Debug("[HTTPClient] Wrapping socket in TLS", c.host)
+		tlsConn := tls.Client(c.conn, &tls.Config{InsecureSkipVerify: true, ServerName: c.host})
 
 		if err = tlsConn.Handshake(); err != nil {
 			return
 		}
 
 		c.conn = tlsConn
+		Debug("[HTTPClient] Successfully wrapped in TLS")
 	}
 
 	return
@@ -112,42 +183,76 @@ func (c *HTTPClient) Disconnect() {
 	}
 }
 
-func (c *HTTPClient) isAlive() bool {
-	one := make([]byte, 1)
-
+func (c *HTTPClient) isAlive(readBytes *int) bool {
 	// Ready 1 byte from socket without timeout to check if it not closed
 	c.conn.SetReadDeadline(time.Now().Add(time.Millisecond))
-	_, err := c.conn.Read(one)
+	n, err := c.conn.Read(c.respBuf[:1])
 
-	if err == nil {
-		return true
-	} else if err == io.EOF {
-		if c.config.Debug {
-			Debug("[HTTPClient] connection closed, reconnecting")
-		}
-		return false
-	} else if err == syscall.EPIPE {
-		Debug("Detected broken pipe.", err)
+	if err == io.EOF {
+		Debug("[HTTPClient] connection closed, reconnecting")
 		return false
 	}
 
+	if err == syscall.EPIPE {
+		Debug("Detected broken pipe.", err)
+		return false
+	}
+	if n != 0 {
+		*readBytes += n
+		Debug("[HTTPClient] isAlive readBytes ", *readBytes)
+	}
 	return true
 }
 
+func (c *HTTPClient) SendGoClient(data []byte) ([]byte, error) {
+	var req *http.Request
+	var resp *http.Response
+	var err error
+
+	req, err = http.ReadRequest(bufio.NewReader(bytes.NewBuffer(data)))
+	if err != nil {
+		return nil, err
+	}
+
+	if !c.config.OriginalHost {
+		req.Host = c.host
+	}
+
+	if c.auth != "" {
+		req.Header.Add("Authorization", c.auth)
+	}
+
+	req.URL, _ = url.ParseRequestURI(c.scheme + "://" + c.host + req.RequestURI)
+	req.RequestURI = ""
+
+	resp, err = c.goClient.Do(req)
+	if err != nil {
+		return nil, err
+	}
+
+	return httputil.DumpResponse(resp, true)
+}
+
 func (c *HTTPClient) Send(data []byte) (response []byte, err error) {
 	// Don't exit on panic
 	defer func() {
 		if r := recover(); r != nil {
 			Debug("[HTTPClient]", r, string(data))
 
-			if _, ok := r.(error); !ok {
+			if _, ok := r.(error); ok {
 				log.Println("[HTTPClient] Failed to send request: ", string(data))
-				log.Println("PANIC: pkg:", r, debug.Stack())
+				log.Println("[HTTPClient] Response: ", string(response))
+				log.Println("PANIC: pkg:", r, string(debug.Stack()))
 			}
 		}
 	}()
 
-	if c.conn == nil || !c.isAlive() {
+	if c.config.CompatibilityMode {
+		return c.SendGoClient(data)
+	}
+
+	var readBytes int
+	if c.conn == nil || !c.isAlive(&readBytes) {
 		Debug("[HTTPClient] Connecting:", c.baseURL)
 		if err = c.Connect(); err != nil {
 			log.Println("[HTTPClient] Connection error:", err)
@@ -164,17 +269,37 @@ func (c *HTTPClient) Send(data []byte) (response []byte, err error) {
 		data = proto.SetHost(data, []byte(c.baseURL), []byte(c.host))
 	}
 
+	if c.isProxy() && c.scheme == "http" {
+		path := proto.Path(data)
+		if len(path) > 0 && path[0] == '/' {
+			data = proto.SetPath(data, c.proxyPath(path))
+			if c.proxyAuth != "" {
+				data = proto.SetHeader(data, []byte("Proxy-Authorization"), []byte(c.proxyAuth))
+			}
+		}
+	}
+
+	if c.auth != "" {
+		data = proto.SetHeader(data, []byte("Authorization"), []byte(c.auth))
+	}
+
 	if c.config.Debug {
 		Debug("[HTTPClient] Sending:", string(data))
 	}
 
+	return c.send(data, readBytes, timeout)
+}
+
+func (c *HTTPClient) send(data []byte, readBytes int, timeout time.Time) (response []byte, err error) {
+	var payload []byte
+	var n int
 	if _, err = c.conn.Write(data); err != nil {
 		Debug("[HTTPClient] Write error:", err, c.baseURL)
 		response = errorPayload(HTTP_TIMEOUT)
+		c.Disconnect()
 		return
 	}
 
-	var readBytes, n int
 	var currentChunk []byte
 	timeout = time.Now().Add(c.config.Timeout)
 	chunked := false
@@ -190,25 +315,33 @@ func (c *HTTPClient) Send(data []byte) (response []byte, err error) {
 			readBytes += n
 			chunks++
 
-			if err != nil {
-				if err == io.EOF {
-					err = nil
-				}
-				break
-			}
-
 			// First chunk
 			if chunked || contentLength != -1 {
 				currentContentLength += n
 			} else {
 				// If headers are finished
-				if bytes.Contains(c.respBuf[:readBytes], proto.EmptyLine) {
-					if bytes.Equal(proto.Header(c.respBuf, []byte("Transfer-Encoding")), []byte("chunked")) {
+				var firstEmptyLine = bytes.Index(c.respBuf[:readBytes], proto.EmptyLine)
+				if firstEmptyLine != -1 {
+					if bytes.Equal(proto.Header(c.respBuf[:readBytes], []byte("Transfer-Encoding")), []byte("chunked")) {
 						chunked = true
 					} else {
-						l := proto.Header(c.respBuf, []byte("Content-Length"))
-						if len(l) > 0 {
-							contentLength, _ = strconv.Atoi(string(l))
+						status, _ := strconv.Atoi(string(proto.Status(c.respBuf[:readBytes])))
+						// We want to soak up all 100 Continues received to get the real result code
+						if status >= 100 && status < 200 {
+							timeout = time.Now().Add(c.config.Timeout)
+							var deleteLen = firstEmptyLine + len(proto.EmptyLine)
+							copy(c.respBuf, c.respBuf[deleteLen:readBytes])
+							readBytes -= deleteLen
+							chunks--
+							continue
+						} else if status == 204 || status == 304 {
+							contentLength = 0
+							break
+						} else {
+							l := proto.Header(c.respBuf[:readBytes], []byte("Content-Length"))
+							if len(l) > 0 {
+								contentLength, _ = strconv.Atoi(string(l))
+							}
 						}
 					}
 
@@ -230,6 +363,13 @@ func (c *HTTPClient) Send(data []byte) (response []byte, err error) {
 					break
 				}
 			}
+
+			if err != nil {
+				if err == io.EOF {
+					err = nil
+				}
+				break
+			}
 		} else {
 			if currentChunk == nil {
 				currentChunk = make([]byte, readChunkSize)
@@ -237,13 +377,6 @@ func (c *HTTPClient) Send(data []byte) (response []byte, err error) {
 
 			n, err = c.conn.Read(currentChunk)
 
-			if err == io.EOF {
-				break
-			} else if err != nil {
-				Debug("[HTTPClient] Read the whole body error:", err, c.baseURL)
-				break
-			}
-
 			readBytes += int(n)
 			chunks++
 			currentContentLength += n
@@ -266,6 +399,14 @@ func (c *HTTPClient) Send(data []byte) (response []byte, err error) {
 				c.Disconnect()
 				break
 			}
+
+			if err == io.EOF {
+				break
+			} else if err != nil {
+				Debug("[HTTPClient] Read the whole body error:", err, c.baseURL)
+				break
+			}
+
 		}
 
 		if readBytes >= maxResponseSize {
@@ -278,16 +419,32 @@ func (c *HTTPClient) Send(data []byte) (response []byte, err error) {
 		timeout = time.Now().Add(c.config.Timeout / 5)
 	}
 
-	if err != nil {
-		Debug("[HTTPClient] Response read error", err, c.conn, readBytes)
+	if err != nil && readBytes == 0 {
+		maxRead := 100
+		if readBytes < maxRead {
+			maxRead = readBytes
+		}
+		Debug("[HTTPClient] Response read timeout error", err, c.conn, readBytes, string(c.respBuf[:maxRead]))
 		response = errorPayload(HTTP_TIMEOUT)
+		c.Disconnect()
+		return
+	}
+
+	if readBytes < 4 || string(c.respBuf[:4]) != "HTTP" {
+		maxRead := 100
+		if readBytes < maxRead {
+			maxRead = readBytes
+		}
+		Debug("[HTTPClient] Response read unknown error", err, c.conn, readBytes, string(c.respBuf[:maxRead]))
+		response = errorPayload(HTTP_UNKNOWN_ERROR)
+		c.Disconnect()
 		return
 	}
 
 	if readBytes > len(c.respBuf) {
 		readBytes = len(c.respBuf)
 	}
-	payload := make([]byte, readBytes)
+	payload = make([]byte, readBytes)
 	copy(payload, c.respBuf[:readBytes])
 
 	if c.config.Debug {
@@ -302,7 +459,7 @@ func (c *HTTPClient) Send(data []byte) (response []byte, err error) {
 			c.redirectsCount++
 
 			location := proto.Header(payload, []byte("Location"))
-			redirectPayload := []byte("GET " + string(location) + " HTTP/1.1\r\n\r\n")
+			redirectPayload := proto.SetPath(data, location)
 
 			if c.config.Debug {
 				Debug("[HTTPClient] Redirecting to: " + string(location))
@@ -312,6 +469,11 @@ func (c *HTTPClient) Send(data []byte) (response []byte, err error) {
 		}
 	}
 
+	if bytes.Equal(proto.Status(payload), []byte("400")) {
+		Debug("[HTTPClient] Closed connection on 400 response")
+		c.Disconnect()
+	}
+
 	c.redirectsCount = 0
 
 	return payload, err
@@ -331,6 +493,14 @@ func (c *HTTPClient) Post(path string, body []byte) (response []byte, err error)
 	return c.Send([]byte(payload))
 }
 
+func (c *HTTPClient) proxyPath(path []byte) []byte {
+	return append([]byte(c.scheme+"://"+c.host), path...)
+}
+
+func (c *HTTPClient) isProxy() bool {
+	return c.proxy != nil
+}
+
 const (
 	// https://support.cloudflare.com/hc/en-us/articles/200171936-Error-520-Web-server-is-returning-an-unknown-error
 	HTTP_UNKNOWN_ERROR = "520"

http_client_test.go

@@ -3,7 +3,6 @@ package main
 import (
 	"bytes"
 	"crypto/rand"
-	"github.com/buger/gor/proto"
 	"io/ioutil"
 	_ "log"
 	"net"
@@ -11,9 +10,12 @@ import (
 	"net/http/httptest"
 	"net/http/httputil"
 	_ "reflect"
+	"strings"
 	"sync"
 	"testing"
 	"time"
+
+	"github.com/buger/goreplay/proto"
 )
 
 func TestHTTPClientURLPort(t *testing.T) {
@@ -23,8 +25,8 @@ func TestHTTPClientURLPort(t *testing.T) {
 	}
 
 	c2 := NewHTTPClient("https://example.com", &HTTPClientConfig{})
-	if c2.baseURL != "https://example.com:443" {
-		t.Error("Sould add 443 port for https:", c2.baseURL)
+	if c2.baseURL != "https://example.com" {
+		t.Error("Sould not add 443 port for https:", c2.baseURL)
 	}
 
 	c3 := NewHTTPClient("https://example.com:1", &HTTPClientConfig{})
@@ -85,6 +87,56 @@ func TestHTTPClientSend(t *testing.T) {
 	client.Send(payload("POST"))
 
 	wg.Wait()
+
+	client = NewHTTPClient(server.URL, &HTTPClientConfig{Debug: true, CompatibilityMode: true})
+
+	wg.Add(4)
+
+	if _, err := client.Send(payload("POST")); err != nil {
+		t.Fatal(err.Error())
+	}
+	if _, err := client.Send(payload("GET")); err != nil {
+		t.Fatal(err.Error())
+	}
+	if _, err := client.Send(payload("POST_CHUNKED")); err != nil {
+		t.Fatal(err.Error())
+	}
+	if _, err := client.Send(payload("POST")); err != nil {
+		t.Fatal(err.Error())
+	}
+
+	wg.Wait()
+}
+
+func TestHTTPClientResonseByClose(t *testing.T) {
+	wg := new(sync.WaitGroup)
+
+	payload := []byte("GET / HTTP/1.1\r\n\r\n")
+	ln, _ := net.Listen("tcp", ":0")
+	go func() {
+		for {
+			conn, _ := ln.Accept()
+			buf := make([]byte, 4096)
+			conn.Read(buf)
+
+			conn.Write([]byte("HTTP/1.1 200 OK\r\n\r\n"))
+			conn.Write([]byte("ab"))
+			conn.Close()
+
+			wg.Done()
+		}
+	}()
+
+	client := NewHTTPClient(ln.Addr().String(), &HTTPClientConfig{Debug: true})
+
+	wg.Add(1)
+	resp, _ := client.Send(payload)
+
+	if !bytes.Equal(resp, []byte("HTTP/1.1 200 OK\r\n\r\nab")) {
+		t.Error("Should return valid response", string(resp))
+	}
+
+	wg.Wait()
 }
 
 // https://github.com/buger/gor/issues/184
@@ -325,6 +377,74 @@ func TestHTTPClientRedirectLimit(t *testing.T) {
 	wg.Wait()
 }
 
+func TestHTTPClientKeepHeadersRedirect(t *testing.T) {
+	wg := new(sync.WaitGroup)
+
+	GETPayload := []byte("GET / HTTP/1.1\r\n\r\n")
+
+	GETPayload = proto.AddHeader(GETPayload, []byte("keep-header"), []byte("true"))
+
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+
+		if r.URL.Path == "/" {
+			http.Redirect(w, r, "/new", 301)
+		}
+
+		if r.Header.Get("keep-header") != "true" {
+			t.Errorf("Header keep-header was incorrect, got: %s, want: %s.", r.Header.Get("keep-header"), "true")
+		}
+
+		wg.Done()
+	}))
+	defer server.Close()
+
+	client := NewHTTPClient(server.URL, &HTTPClientConfig{FollowRedirects: 1, Debug: false})
+
+	wg.Add(2)
+	client.Send(GETPayload)
+
+	wg.Wait()
+}
+
+func TestHTTPClientBasicAuth(t *testing.T) {
+	wg := new(sync.WaitGroup)
+	wg.Add(2)
+
+	GETPayload := []byte("GET / HTTP/1.1\r\n\r\n")
+
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		user, pass, _ := r.BasicAuth()
+
+		if user != "user" || pass != "pass" {
+			http.Error(w, "Unauthorized.", 401)
+			wg.Done()
+			return
+		}
+
+		wg.Done()
+	}))
+	defer server.Close()
+
+	client := NewHTTPClient(server.URL, &HTTPClientConfig{Debug: false})
+	resp, _ := client.Send(GETPayload)
+	client.Disconnect()
+
+	if !bytes.Equal(proto.Status(resp), []byte("401")) {
+		t.Error("Should return unauthorized error", string(resp))
+	}
+
+	authUrl := strings.Replace(server.URL, "http://", "http://user:pass@", -1)
+	client = NewHTTPClient(authUrl, &HTTPClientConfig{Debug: false})
+	resp, _ = client.Send(GETPayload)
+	client.Disconnect()
+
+	if !bytes.Equal(proto.Status(resp), []byte("200")) {
+		t.Error("Should return proper response", string(resp))
+	}
+
+	wg.Wait()
+}
+
 func TestHTTPClientHandleHTTP10(t *testing.T) {
 	wg := new(sync.WaitGroup)
 

http_modifier.go

@@ -2,9 +2,11 @@ package main
 
 import (
 	"bytes"
+	"encoding/base64"
 	"hash/fnv"
+	"strings"
 
-	"github.com/buger/gor/proto"
+	"github.com/buger/goreplay/proto"
 )
 
 type HTTPModifier struct {
@@ -16,8 +18,10 @@ func NewHTTPModifier(config *HTTPModifierConfig) *HTTPModifier {
 	if len(config.urlRegexp) == 0 &&
 		len(config.urlNegativeRegexp) == 0 &&
 		len(config.urlRewrite) == 0 &&
+		len(config.headerRewrite) == 0 &&
 		len(config.headerFilters) == 0 &&
 		len(config.headerNegativeFilters) == 0 &&
+		len(config.headerBasicAuthFilters) == 0 &&
 		len(config.headerHashFilters) == 0 &&
 		len(config.paramHashFilters) == 0 &&
 		len(config.params) == 0 &&
@@ -94,7 +98,11 @@ func (m *HTTPModifier) Rewrite(payload []byte) (response []byte) {
 		for _, f := range m.config.headerFilters {
 			value := proto.Header(payload, f.name)
 
-			if len(value) > 0 && !f.regexp.Match(value) {
+			if len(value) == 0 {
+				return
+			}
+
+			if !f.regexp.Match(value) {
 				return
 			}
 		}
@@ -110,6 +118,23 @@ func (m *HTTPModifier) Rewrite(payload []byte) (response []byte) {
 		}
 	}
 
+	if len(m.config.headerBasicAuthFilters) > 0 {
+		for _, f := range m.config.headerBasicAuthFilters {
+			value := proto.Header(payload, []byte("Authorization"))
+
+			if len(value) > 0 {
+				valueString := string(value)
+				trimmedBasicAuthEncoded := strings.TrimPrefix(valueString, "Basic ")
+				if strings.Compare(valueString, trimmedBasicAuthEncoded) != 0 {
+					decodedAuth, _ := base64.StdEncoding.DecodeString(trimmedBasicAuthEncoded)
+					if !f.regexp.Match(decodedAuth) {
+						return
+					}
+				}
+			}
+		}
+	}
+
 	if len(m.config.headerHashFilters) > 0 {
 		for _, f := range m.config.headerHashFilters {
 			value := proto.Header(payload, f.name)
@@ -153,5 +178,19 @@ func (m *HTTPModifier) Rewrite(payload []byte) (response []byte) {
 		}
 	}
 
+	if len(m.config.headerRewrite) > 0 {
+		for _, f := range m.config.headerRewrite {
+			value := proto.Header(payload, f.header)
+			if len(value) == 0 {
+				break
+			}
+
+			if f.src.Match(value) {
+				newValue := f.src.ReplaceAll(value, f.target)
+				payload = proto.SetHeader(payload, f.header, newValue)
+			}
+		}
+	}
+
 	return payload
 }

http_modifier_settings.go

@@ -10,13 +10,15 @@ import (
 
 // HTTPModifierConfig holds configuration options for built-in traffic modifier
 type HTTPModifierConfig struct {
-	urlNegativeRegexp     HTTPUrlRegexp
-	urlRegexp             HTTPUrlRegexp
-	urlRewrite            UrlRewriteMap
-	headerFilters         HTTPHeaderFilters
-	headerNegativeFilters HTTPHeaderFilters
-	headerHashFilters     HTTPHashFilters
-	paramHashFilters      HTTPHashFilters
+	urlNegativeRegexp      HTTPUrlRegexp
+	urlRegexp              HTTPUrlRegexp
+	urlRewrite             UrlRewriteMap
+	headerRewrite          HeaderRewriteMap
+	headerFilters          HTTPHeaderFilters
+	headerNegativeFilters  HTTPHeaderFilters
+	headerBasicAuthFilters HTTPHeaderBasicAuthFilters
+	headerHashFilters      HTTPHashFilters
+	paramHashFilters       HTTPHashFilters
 
 	params  HTTPParams
 	headers HTTPHeaders
@@ -43,7 +45,8 @@ func (h *HTTPHeaderFilters) Set(value string) error {
 	if len(valArr) < 2 {
 		return errors.New("need both header and value, colon-delimited (ex. user_id:^169$).")
 	}
-	r, err := regexp.Compile(valArr[1])
+	val := strings.TrimSpace(valArr[1])
+	r, err := regexp.Compile(val)
 	if err != nil {
 		return err
 	}
@@ -53,6 +56,31 @@ func (h *HTTPHeaderFilters) Set(value string) error {
 	return nil
 }
 
+//
+// Handling of --http-basic-auth-filter option
+//
+type basicAuthFilter struct {
+	regexp *regexp.Regexp
+}
+
+// HTTPHeaderFilters holds list of headers and their regexps
+type HTTPHeaderBasicAuthFilters []basicAuthFilter
+
+func (h *HTTPHeaderBasicAuthFilters) String() string {
+	return fmt.Sprint(*h)
+}
+
+func (h *HTTPHeaderBasicAuthFilters) Set(value string) error {
+	r, err := regexp.Compile(value)
+	if err != nil {
+		return err
+	}
+
+	*h = append(*h, basicAuthFilter{regexp: r})
+
+	return nil
+}
+
 //
 // Handling of --http-allow-header-hash and --http-allow-param-hash options
 //
@@ -75,14 +103,16 @@ func (h *HTTPHashFilters) Set(value string) error {
 
 	f := hashFilter{name: []byte(valArr[0])}
 
-	if strings.Contains(valArr[1], "%") {
-		p, _ := strconv.ParseInt(valArr[1][:len(valArr[1])-1], 0, 0)
+	val := strings.TrimSpace(valArr[1])
+
+	if strings.Contains(val, "%") {
+		p, _ := strconv.ParseInt(val[:len(val)-1], 0, 0)
 		f.percent = uint32(p)
-	} else if strings.Contains(valArr[1], "/") {
+	} else if strings.Contains(val, "/") {
 		// DEPRECATED format
 		var num, den uint64
 
-		fracArr := strings.Split(valArr[1], "/")
+		fracArr := strings.Split(val, "/")
 		num, _ = strconv.ParseUint(fracArr[0], 10, 64)
 		den, _ = strconv.ParseUint(fracArr[1], 10, 64)
 
@@ -193,6 +223,42 @@ func (r *UrlRewriteMap) Set(value string) error {
 	return nil
 }
 
+//
+// Handling of --http-rewrite-header option
+//
+type headerRewrite struct {
+	header []byte
+	src    *regexp.Regexp
+	target []byte
+}
+
+type HeaderRewriteMap []headerRewrite
+
+func (r *HeaderRewriteMap) String() string {
+	return fmt.Sprint(*r)
+}
+
+func (r *HeaderRewriteMap) Set(value string) error {
+	headerArr := strings.SplitN(value, ":", 2)
+	if len(headerArr) < 2 {
+		return errors.New("need both header, regexp and rewrite target, colon-delimited (ex. Header: regexp,target)")
+	}
+
+	header := headerArr[0]
+	valArr := strings.SplitN(strings.TrimSpace(headerArr[1]), ",", 2)
+
+	if len(valArr) < 2 {
+		return errors.New("need both header, regexp and rewrite target, colon-delimited (ex. Header: regexp,target)")
+	}
+
+	regexp, err := regexp.Compile(valArr[0])
+	if err != nil {
+		return err
+	}
+	*r = append(*r, headerRewrite{header: []byte(header), src: regexp, target: []byte(valArr[1])})
+	return nil
+}
+
 //
 // Handling of --http-allow-url option
 //

http_modifier_test.go

@@ -2,8 +2,9 @@ package main
 
 import (
 	"bytes"
-	"github.com/buger/gor/proto"
 	"testing"
+
+	"github.com/buger/goreplay/proto"
 )
 
 func TestHTTPModifierWithoutConfig(t *testing.T) {
@@ -64,6 +65,57 @@ func TestHTTPModifierHeaderNegativeFilters(t *testing.T) {
 	if len(modifier.Rewrite(payload)) != 0 {
 		t.Error("Request should not pass filters")
 	}
+
+	filters = HTTPHeaderFilters{}
+	// Setting filter that not match our header
+	filters.Set("Host: www*")
+
+	modifier = NewHTTPModifier(&HTTPModifierConfig{
+		headerNegativeFilters: filters,
+	})
+
+	if len(modifier.Rewrite(payload)) != 0 {
+		t.Error("Request should not pass filters")
+	}
+}
+
+func TestHTTPHeaderBasicAuthFilters(t *testing.T) {
+	filters := HTTPHeaderBasicAuthFilters{}
+	filters.Set("^customer[0-9].*")
+
+	modifier := NewHTTPModifier(&HTTPModifierConfig{
+		headerBasicAuthFilters: filters,
+	})
+
+	//Encoded UserId:Password = customer3:welcome
+	payload := []byte("POST /post HTTP/1.1\r\nContent-Length: 7\r\nAuthorization: Basic Y3VzdG9tZXIzOndlbGNvbWU=\r\n\r\na=1&b=2")
+	if len(modifier.Rewrite(payload)) == 0 {
+		t.Error("Request should pass filters")
+	}
+
+	//customer6:rest@123^TEST
+	payload = []byte("POST /post HTTP/1.1\r\nContent-Length: 88\r\nAuthorization: Basic Y3VzdG9tZXI2OnJlc3RAMTIzXlRFU1Q==\r\n\r\na=1&b=2")
+	if len(modifier.Rewrite(payload)) == 0 {
+		t.Error("Request should pass filters")
+	}
+
+	filters = HTTPHeaderBasicAuthFilters{}
+	// Setting filter that not match our header
+	filters.Set("^(homer simpson|mickey mouse).*")
+
+	modifier = NewHTTPModifier(&HTTPModifierConfig{
+		headerBasicAuthFilters: filters,
+	})
+
+	if len(modifier.Rewrite(payload)) != 0 {
+		t.Error("Request should not pass filters")
+	}
+
+	//mickey mouse:happy123
+	payload = []byte("POST /post HTTP/1.1\r\nContent-Length: 88\r\nAuthorization: Basic bWlja2V5IG1vdXNlOmhhcHB5MTIz\r\n\r\na=1&b=2")
+	if len(modifier.Rewrite(payload)) == 0 {
+		t.Error("Request should pass filters")
+	}
 }
 
 func TestHTTPModifierURLRewrite(t *testing.T) {
@@ -95,6 +147,27 @@ func TestHTTPModifierURLRewrite(t *testing.T) {
 	}
 }
 
+func TestHTTPModifierHeaderRewrite(t *testing.T) {
+	var header, newHeader []byte
+
+	rewrites := HeaderRewriteMap{}
+	payload := []byte("GET / HTTP/1.1\r\nContent-Length: 7\r\nHost: www.w3.org\r\n\r\na=1&b=2")
+
+	err := rewrites.Set("Host: (.*).w3.org,$1.beta.w3.org")
+	if err != nil {
+		t.Error("Should not error", err)
+	}
+
+	modifier := NewHTTPModifier(&HTTPModifierConfig{
+		headerRewrite: rewrites,
+	})
+
+	header = []byte("www.beta.w3.org")
+	if newHeader = proto.Header(modifier.Rewrite(payload), []byte("Host")); !bytes.Equal(newHeader, header) {
+		t.Error("Request header should have been rewritten, wasn't", string(newHeader), string(header))
+	}
+}
+
 func TestHTTPModifierHeaderHashFilters(t *testing.T) {
 	filters := HTTPHashFilters{}
 	filters.Set("Header2:1/2")

http_prettifier.go

@@ -0,0 +1,75 @@
+package main
+
+import (
+	"bytes"
+	"compress/gzip"
+	"io/ioutil"
+	"net/http/httputil"
+	"strconv"
+
+	"github.com/buger/goreplay/proto"
+)
+
+func prettifyHTTP(p []byte) []byte {
+	headSize := bytes.IndexByte(p, '\n') + 1
+	head := p[:headSize]
+	body := p[headSize:]
+
+	headersPos := proto.MIMEHeadersEndPos(body)
+
+	if headersPos < 5 || headersPos > len(body) {
+		return p
+	}
+
+	headers := body[:headersPos]
+	content := body[headersPos:]
+
+	var tEnc, cEnc []byte
+	proto.ParseHeaders([][]byte{headers}, func(header, value []byte) bool {
+		if proto.HeadersEqual(header, []byte("Transfer-Encoding")) {
+			tEnc = value
+		}
+
+		if proto.HeadersEqual(header, []byte("Content-Encoding")) {
+			cEnc = value
+		}
+
+		return true
+	})
+
+	if len(tEnc) == 0 && len(cEnc) == 0 {
+		return p
+	}
+
+	if bytes.Equal(tEnc, []byte("chunked")) {
+		buf := bytes.NewBuffer(content)
+		r := httputil.NewChunkedReader(buf)
+		content, _ = ioutil.ReadAll(r)
+
+		headers = proto.DeleteHeader(headers, []byte("Transfer-Encoding"))
+
+		newLen := strconv.Itoa(len(content))
+		headers = proto.SetHeader(headers, []byte("Content-Length"), []byte(newLen))
+	}
+
+	if bytes.Equal(cEnc, []byte("gzip")) {
+		buf := bytes.NewBuffer(content)
+		g, err := gzip.NewReader(buf)
+
+		if err != nil {
+			Debug("[Prettifier] GZIP encoding error:", err)
+			return []byte{}
+		}
+
+		content, _ = ioutil.ReadAll(g)
+
+		headers = proto.DeleteHeader(headers, []byte("Content-Encoding"))
+
+		newLen := strconv.Itoa(len(content))
+		headers = proto.SetHeader(headers, []byte("Content-Length"), []byte(newLen))
+	}
+
+	newPayload := append(append(head, headers...), content...)
+
+	return newPayload
+}

http_prettifier_test.go

@@ -0,0 +1,36 @@
+package main
+
+import (
+	"bytes"
+	"compress/gzip"
+	"strconv"
+	"testing"
+)
+
+func TestHTTPPrettifierGzip(t *testing.T) {
+	b := bytes.NewBufferString("")
+	w := gzip.NewWriter(b)
+	w.Write([]byte("test"))
+	w.Close()
+
+	size := strconv.Itoa(len(b.Bytes()))
+
+	payload := []byte("2 1 1\nHTTP/1.1 200 OK\r\nContent-Length: " + size + "\r\nContent-Encoding: gzip\r\n\r\n")
+	payload = append(payload, b.Bytes()...)
+
+	newPayload := prettifyHTTP(payload)
+
+	if string(newPayload) != "2 1 1\nHTTP/1.1 200 OK\r\nContent-Length: 4\r\n\r\ntest" {
+		t.Error("Payload not match:", string(newPayload))
+	}
+}
+
+func TestHTTPPrettifierChunked(t *testing.T) {
+	payload := []byte("POST / HTTP/1.1\r\nHost: www.w3.org\r\nTransfer-Encoding: chunked\r\n\r\n4\r\nWiki\r\n5\r\npedia\r\ne\r\n in\r\n\r\nchunks.\r\n0\r\n\r\n")
+
+	newPayload := prettifyHTTP(payload)
+
+	if string(newPayload) != "POST / HTTP/1.1\r\nHost: www.w3.org\r\nContent-Length: 23\r\n\r\nWikipedia in\r\n\r\nchunks." {
+		t.Error("Payload not match:", string(newPayload))
+	}
+}

input_dummy.go

@@ -34,10 +34,10 @@ func (i *DummyInput) emit() {
 		select {
 		case <-ticker.C:
 			uuid := uuid()
-			reqh := payloadHeader(RequestPayload, uuid, time.Now().UnixNano())
+			reqh := payloadHeader(RequestPayload, uuid, time.Now().UnixNano(), -1)
 			i.data <- append(reqh, []byte("GET / HTTP/1.1\r\nHost: www.w3.org\r\nUser-Agent: Go 1.1 package http\r\nAccept-Encoding: gzip\r\n\r\n")...)
 
-			resh := payloadHeader(ResponsePayload, uuid, 1)
+			resh := payloadHeader(ResponsePayload, uuid, time.Now().UnixNano()+1, 1)
 			i.data <- append(resh, []byte("HTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n")...)
 		}
 	}

input_file.go

@@ -9,31 +9,114 @@ import (
 	"log"
 	"os"
 	"path/filepath"
-	"sort"
 	"strconv"
 	"strings"
+	"sync"
 	"time"
 )
 
+type fileInputReader struct {
+	reader    *bufio.Reader
+	data      []byte
+	file      *os.File
+	timestamp int64
+}
+
+func (f *fileInputReader) parseNext() error {
+	payloadSeparatorAsBytes := []byte(payloadSeparator)
+	var buffer bytes.Buffer
+
+	for {
+		line, err := f.reader.ReadBytes('\n')
+
+		if err != nil {
+			if err != io.EOF {
+				log.Println(err)
+				return err
+			}
+
+			if err == io.EOF {
+				f.file.Close()
+				f.file = nil
+				return err
+			}
+		}
+
+		if bytes.Equal(payloadSeparatorAsBytes[1:], line) {
+			asBytes := buffer.Bytes()
+			meta := payloadMeta(asBytes)
+
+			f.timestamp, _ = strconv.ParseInt(string(meta[2]), 10, 64)
+			f.data = asBytes[:len(asBytes)-1]
+
+			return nil
+		}
+
+		buffer.Write(line)
+	}
+
+	return nil
+}
+
+func (f *fileInputReader) ReadPayload() []byte {
+	defer f.parseNext()
+
+	return f.data
+}
+func (f *fileInputReader) Close() error {
+	if f.file != nil {
+		f.file.Close()
+	}
+
+	return nil
+}
+
+func NewFileInputReader(path string) *fileInputReader {
+	file, err := os.Open(path)
+
+	if err != nil {
+		log.Println(err)
+		return nil
+	}
+
+	r := &fileInputReader{file: file}
+	if strings.HasSuffix(path, ".gz") {
+		gzReader, err := gzip.NewReader(file)
+		if err != nil {
+			log.Println(err)
+			return nil
+		}
+		r.reader = bufio.NewReader(gzReader)
+	} else {
+		r.reader = bufio.NewReader(file)
+	}
+
+	r.parseNext()
+
+	return r
+}
+
 // FileInput can read requests generated by FileOutput
 type FileInput struct {
-	data          chan []byte
-	path          string
-	currentFile   *os.File
-	currentReader *bufio.Reader
-	speedFactor   float64
-	loop          bool
+	mu          sync.Mutex
+	data        chan []byte
+	exit        chan bool
+	path        string
+	readers     []*fileInputReader
+	speedFactor float64
+	loop        bool
 }
 
 // NewFileInput constructor for FileInput. Accepts file path as argument.
 func NewFileInput(path string, loop bool) (i *FileInput) {
 	i = new(FileInput)
-	i.data = make(chan []byte)
+	i.data = make(chan []byte, 1000)
+	i.exit = make(chan bool, 1)
 	i.path = path
 	i.speedFactor = 1
 	i.loop = loop
 
-	if err := i.updateFile(); err != nil {
+	if err := i.init(); err != nil {
 		return
 	}
 
@@ -48,9 +131,10 @@ func (_ *NextFileNotFound) Error() string {
 	return "There is no new files"
 }
 
-// path can be a pattern
-// It sort paths lexicographically and tries to choose next one
-func (i *FileInput) updateFile() (err error) {
+func (i *FileInput) init() (err error) {
+	defer i.mu.Unlock()
+	i.mu.Lock()
+
 	var matches []string
 
 	if matches, err = filepath.Glob(i.path); err != nil {
@@ -63,40 +147,10 @@ func (i *FileInput) updateFile() (err error) {
 		return errors.New("No matching files")
 	}
 
-	sort.Sort(sortByFileIndex(matches))
+	i.readers = make([]*fileInputReader, len(matches))
 
-	// Just pick first file, if there is many, and we are just started
-	if i.currentFile == nil {
-		if i.currentFile, err = os.Open(matches[0]); err != nil {
-			log.Println("Can't read file ", matches[0], err)
-			return
-		}
-	} else {
-		found := false
-		for idx, p := range matches {
-			if p == i.currentFile.Name() && idx != len(matches)-1 {
-				if i.currentFile, err = os.Open(matches[idx+1]); err != nil {
-					log.Println("Can't read file ", matches[idx+1], err)
-					return
-				}
-
-				found = true
-			}
-		}
-
-		if !found {
-			return new(NextFileNotFound)
-		}
-	}
-
-	if strings.HasSuffix(i.currentFile.Name(), ".gz") {
-		gzReader, err := gzip.NewReader(i.currentFile)
-		if err != nil {
-			log.Fatal(err)
-		}
-		i.currentReader = bufio.NewReader(gzReader)
-	} else {
-		i.currentReader = bufio.NewReader(i.currentFile)
+	for idx, p := range matches {
+		i.readers[idx] = NewFileInputReader(p)
 	}
 
 	return nil
@@ -113,83 +167,79 @@ func (i *FileInput) String() string {
 	return "File input: " + i.path
 }
 
-func (i *FileInput) emit() {
-	var lastTime int64
+// Find reader with smallest timestamp e.g next payload in row
+func (i *FileInput) nextReader() (next *fileInputReader) {
+	for _, r := range i.readers {
+		if r == nil || r.file == nil {
+			continue
+		}
 
-	payloadSeparatorAsBytes := []byte(payloadSeparator)
-
-	var buffer bytes.Buffer
-
-	if i.currentReader == nil {
-		return
+		if next == nil || r.timestamp < next.timestamp {
+			next = r
+			continue
+		}
 	}
 
+	return
+}
+
+func (i *FileInput) emit() {
+	var lastTime int64 = -1
+
 	for {
-		line, err := i.currentReader.ReadBytes('\n')
+		select {
+		case <-i.exit:
+			return
+		default:
+		}
 
-		if err != nil {
-			if err != io.EOF {
-				log.Fatal(err)
-			}
-
-			// If our path pattern match multiple files, try to find them
-			if err == io.EOF {
-				if e := i.updateFile(); e != nil {
-					if _, ok := e.(*NextFileNotFound); ok && i.loop {
-						// Start from the first file
-						i.Close()
-						i.currentFile = nil
-						i.currentReader = nil
-						lastTime = 0
-						i.updateFile()
-
-						continue
-					} else {
-						break
-					}
-				}
+		reader := i.nextReader()
 
+		if reader == nil {
+			if i.loop {
+				i.init()
+				lastTime = -1
 				continue
+			} else {
+				break
 			}
 		}
 
-		if bytes.Equal(payloadSeparatorAsBytes[1:], line) {
-			asBytes := buffer.Bytes()
-			buffer.Reset()
+		if lastTime != -1 {
+			diff := reader.timestamp - lastTime
+			lastTime = reader.timestamp
 
-			meta := payloadMeta(asBytes)
-
-			if len(meta) > 2 && meta[0][0] == RequestPayload {
-				ts, _ := strconv.ParseInt(string(meta[2]), 10, 64)
-
-				if lastTime != 0 {
-					timeDiff := ts - lastTime
-
-					if i.speedFactor != 1 {
-						timeDiff = int64(float64(timeDiff) / i.speedFactor)
-					}
-
-					time.Sleep(time.Duration(timeDiff))
-				}
-
-				lastTime = ts
+			if i.speedFactor != 1 {
+				diff = int64(float64(diff) / i.speedFactor)
 			}
 
-			// Bytes() returns only pointer, so to remove data-race copy the data to an array
-			newBuf := make([]byte, len(asBytes)-1)
-			copy(newBuf, asBytes)
-
-			i.data <- newBuf
+			time.Sleep(time.Duration(diff))
 		} else {
-			buffer.Write(line)
+			lastTime = reader.timestamp
 		}
 
+		i.data <- reader.ReadPayload()
 	}
 
 	log.Printf("FileInput: end of file '%s'\n", i.path)
+
+	// For now having fixed timeout is temporary solution
+	// Further should be modified, so outputs can report if their queue empty or not
+	time.Sleep(time.Second)
+	if closeCh != nil {
+		close(closeCh)
+	}
 }
 
 func (i *FileInput) Close() error {
-	i.currentFile.Close()
+	defer i.mu.Unlock()
+	i.mu.Lock()
+
+	i.exit <- true
+
+	for _, r := range i.readers {
+		r.Close()
+	}
+
 	return nil
 }

input_file_test.go

@@ -97,35 +97,109 @@ func TestInputFileWithGETAndPOST(t *testing.T) {
 
 }
 
-func TestInputFileMultipleFiles(t *testing.T) {
+func TestInputFileMultipleFilesWithRequestsOnly(t *testing.T) {
 	rnd := rand.Int63()
 
 	file1, _ := os.OpenFile(fmt.Sprintf("/tmp/%d_0", rnd), os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0660)
 	file1.Write([]byte("1 1 1\ntest1"))
 	file1.Write([]byte(payloadSeparator))
-	file1.Write([]byte("1 1 2\ntest2"))
+	file1.Write([]byte("1 1 3\ntest2"))
 	file1.Write([]byte(payloadSeparator))
 	file1.Close()
 
 	file2, _ := os.OpenFile(fmt.Sprintf("/tmp/%d_1", rnd), os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0660)
-	file2.Write([]byte("1 1 3\ntest3"))
+	file2.Write([]byte("1 1 2\ntest3"))
+	file2.Write([]byte(payloadSeparator))
+	file2.Write([]byte("1 1 4\ntest4"))
 	file2.Write([]byte(payloadSeparator))
 	file2.Close()
 
 	input := NewFileInput(fmt.Sprintf("/tmp/%d*", rnd), false)
 	buf := make([]byte, 1000)
-	n, _ := input.Read(buf)
-	if buf[10] != '1' {
-		t.Error("Shound emit requests in right order", string(buf[:n]))
-	}
-	input.Read(buf)
-	if buf[10] != '2' {
-		t.Error("Shound emit requests in right order", string(buf[:n]))
+
+	for i := '1'; i <= '4'; i++ {
+		n, _ := input.Read(buf)
+		if buf[4] != byte(i) {
+			t.Error("Should emit requests in right order", string(buf[:n]))
+		}
 	}
 
-	input.Read(buf)
-	if buf[10] != '3' {
-		t.Error("Shound emit requests from second file", string(buf[:n]))
+	os.Remove(file1.Name())
+	os.Remove(file2.Name())
+}
+
+func TestInputFileRequestsWithLatency(t *testing.T) {
+	rnd := rand.Int63()
+
+	file, _ := os.OpenFile(fmt.Sprintf("/tmp/%d", rnd), os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0660)
+	defer file.Close()
+
+	file.Write([]byte("1 1 100000000\nrequest1"))
+	file.Write([]byte(payloadSeparator))
+	file.Write([]byte("1 2 150000000\nrequest2"))
+	file.Write([]byte(payloadSeparator))
+	file.Write([]byte("1 3 250000000\nrequest3"))
+	file.Write([]byte(payloadSeparator))
+
+	input := NewFileInput(fmt.Sprintf("/tmp/%d", rnd), false)
+	buf := make([]byte, 1000)
+
+	start := time.Now().UnixNano()
+	for i := 0; i < 3; i++ {
+		input.Read(buf)
+	}
+	end := time.Now().UnixNano()
+
+	var expectedLatency int64 = 250000000 - 100000000
+	realLatency := end - start
+	if realLatency < expectedLatency {
+		t.Errorf("Should emit requests respecting latency. Expected: %v, real: %v", expectedLatency, realLatency)
+	}
+
+	if realLatency > expectedLatency+10000000 {
+		t.Errorf("Should emit requests respecting latency. Expected: %v, real: %v", expectedLatency, realLatency)
+
+	}
+}
+
+func TestInputFileMultipleFilesWithRequestsAndResponses(t *testing.T) {
+	rnd := rand.Int63()
+
+	file1, _ := os.OpenFile(fmt.Sprintf("/tmp/%d_0", rnd), os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0660)
+	file1.Write([]byte("1 1 1\nrequest1"))
+	file1.Write([]byte(payloadSeparator))
+	file1.Write([]byte("2 1 1\nresponse1"))
+	file1.Write([]byte(payloadSeparator))
+	file1.Write([]byte("1 2 3\nrequest2"))
+	file1.Write([]byte(payloadSeparator))
+	file1.Write([]byte("2 2 3\nresponse2"))
+	file1.Write([]byte(payloadSeparator))
+	file1.Close()
+
+	file2, _ := os.OpenFile(fmt.Sprintf("/tmp/%d_1", rnd), os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0660)
+	file2.Write([]byte("1 3 2\nrequest3"))
+	file2.Write([]byte(payloadSeparator))
+	file2.Write([]byte("2 3 2\nresponse3"))
+	file2.Write([]byte(payloadSeparator))
+	file2.Write([]byte("1 4 4\nrequest4"))
+	file2.Write([]byte(payloadSeparator))
+	file2.Write([]byte("2 4 4\nresponse4"))
+	file2.Write([]byte(payloadSeparator))
+	file2.Close()
+
+	input := NewFileInput(fmt.Sprintf("/tmp/%d*", rnd), false)
+	buf := make([]byte, 1000)
+
+	for i := '1'; i <= '4'; i++ {
+		n, _ := input.Read(buf)
+		if buf[0] != '1' && buf[4] != byte(i) {
+			t.Error("Shound emit requests in right order", string(buf[:n]))
+		}
+
+		n, _ = input.Read(buf)
+		if buf[0] != '2' && buf[4] != byte(i) {
+			t.Error("Shound emit responses in right order", string(buf[:n]))
+		}
 	}
 
 	os.Remove(file1.Name())
@@ -149,8 +223,8 @@ func TestInputFileLoop(t *testing.T) {
 	for i := 0; i < 1000; i++ {
 		input.Read(buf)
 	}
-	input.Close()
 
+	input.Close()
 	os.Remove(file.Name())
 }
 
@@ -221,11 +295,9 @@ func (expectedCaptureFile *CaptureFile) PayloadsEqual(other [][]byte) bool {
 	}
 
 	for i, payload := range other {
-
 		if !bytes.Equal(expectedCaptureFile.data[i], payload) {
 			return false
 		}
-
 	}
 
 	return true

input_http.go

@@ -29,7 +29,7 @@ func NewHTTPInput(address string) (i *HTTPInput) {
 func (i *HTTPInput) Read(data []byte) (int, error) {
 	buf := <-i.data
 
-	header := payloadHeader(RequestPayload, uuid(), time.Now().UnixNano())
+	header := payloadHeader(RequestPayload, uuid(), time.Now().UnixNano(), -1)
 
 	copy(data[0:len(header)], header)
 	copy(data[len(header):], buf)

input_http_test.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	"github.com/buger/gor/proto"
 	"io"
 	"log"
 	"net/http"
@@ -9,6 +8,8 @@ import (
 	"strings"
 	"sync"
 	"testing"
+
+	"github.com/buger/goreplay/proto"
 )
 
 func TestHTTPInput(t *testing.T) {

input_kafka.go

@@ -0,0 +1,107 @@
+package main
+
+import (
+	"encoding/json"
+	"log"
+	"strings"
+
+	"github.com/Shopify/sarama"
+	"github.com/Shopify/sarama/mocks"
+)
+
+// KafkaInput is used for recieving Kafka messages and
+// transforming them into HTTP payloads.
+type KafkaInput struct {
+	config    *KafkaConfig
+	consumers []sarama.PartitionConsumer
+	messages  chan *sarama.ConsumerMessage
+}
+
+// NewKafkaInput creates instance of kafka consumer client.
+func NewKafkaInput(address string, config *KafkaConfig) *KafkaInput {
+	c := sarama.NewConfig()
+	// Configuration options go here
+
+	var con sarama.Consumer
+
+	if mock, ok := config.consumer.(*mocks.Consumer); ok && mock != nil {
+		con = config.consumer
+	} else {
+		var err error
+		//con, err = sarama.NewConsumer([]string{config.host}, c)
+		con, err = sarama.NewConsumer(strings.Split(config.host, ","), c)
+
+		if err != nil {
+			log.Fatalln("Failed to start Sarama(Kafka) consumer:", err)
+		}
+	}
+
+	partitions, err := con.Partitions(config.topic)
+	if err != nil {
+		log.Fatalln("Failed to collect Sarama(Kafka) partitions:", err)
+	}
+
+	i := &KafkaInput{
+		config:    config,
+		consumers: make([]sarama.PartitionConsumer, len(partitions)),
+		messages:  make(chan *sarama.ConsumerMessage, 256),
+	}
+
+	for index, partition := range partitions {
+		consumer, err := con.ConsumePartition(config.topic, partition, sarama.OffsetNewest)
+		if err != nil {
+			log.Fatalln("Failed to start Sarama(Kafka) partition consumer:", err)
+		}
+
+		go func(consumer sarama.PartitionConsumer) {
+			defer consumer.Close()
+
+			for message := range consumer.Messages() {
+				i.messages <- message
+			}
+		}(consumer)
+
+		if Settings.verbose {
+			// Start infinite loop for tracking errors for kafka producer.
+			go i.ErrorHandler(consumer)
+		}
+
+		i.consumers[index] = consumer
+	}
+
+	return i
+}
+
+// ErrorHandler should receive errors
+func (i *KafkaInput) ErrorHandler(consumer sarama.PartitionConsumer) {
+	for err := range consumer.Errors() {
+		log.Println("Failed to read access log entry:", err)
+	}
+}
+
+func (i *KafkaInput) Read(data []byte) (int, error) {
+	message := <-i.messages
+
+	if !i.config.useJSON {
+		copy(data, message.Value)
+		return len(message.Value), nil
+	}
+
+	var kafkaMessage KafkaMessage
+	json.Unmarshal(message.Value, &kafkaMessage)
+
+	buf, err := kafkaMessage.Dump()
+	if err != nil {
+		log.Println("Failed to decode access log entry:", err)
+		return 0, err
+	}
+
+	copy(data, buf)
+
+	return len(buf), nil
+
+}
+
+func (i *KafkaInput) String() string {
+	return "Kafka Input: " + i.config.host + "/" + i.config.topic
+}

input_kafka_test.go

@@ -0,0 +1,62 @@
+package main
+
+import (
+	"testing"
+
+	"github.com/Shopify/sarama"
+	"github.com/Shopify/sarama/mocks"
+)
+
+func TestInputKafkaRAW(t *testing.T) {
+	consumer := mocks.NewConsumer(t, nil)
+	defer consumer.Close()
+
+	consumer.ExpectConsumePartition("test", 0, mocks.AnyOffset).YieldMessage(&sarama.ConsumerMessage{Value: []byte("1 2 3\nGET / HTTP1.1\r\nHeader: 1\r\n\r\n")})
+	consumer.SetTopicMetadata(
+		map[string][]int32{"test": {0}},
+	)
+
+	input := NewKafkaInput("", &KafkaConfig{
+		consumer: consumer,
+		topic:    "test",
+		useJSON:  false,
+	})
+
+	buf := make([]byte, 1024)
+	n, err := input.Read(buf)
+
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if string(buf[:n]) != "1 2 3\nGET / HTTP1.1\r\nHeader: 1\r\n\r\n" {
+		t.Error("Message not properly decoded: ", string(buf[:n]), n)
+	}
+}
+
+func TestInputKafkaJSON(t *testing.T) {
+	consumer := mocks.NewConsumer(t, nil)
+	defer consumer.Close()
+
+	consumer.ExpectConsumePartition("test", 0, mocks.AnyOffset).YieldMessage(&sarama.ConsumerMessage{Value: []byte(`{"Req_URL":"/","Req_Type":"1","Req_ID":"2","Req_Ts":"3","Req_Method":"GET","Req_Headers":{"Header":"1"}}`)})
+	consumer.SetTopicMetadata(
+		map[string][]int32{"test": {0}},
+	)
+
+	input := NewKafkaInput("", &KafkaConfig{
+		consumer: consumer,
+		topic:    "test",
+		useJSON:  true,
+	})
+
+	buf := make([]byte, 1024)
+	n, err := input.Read(buf)
+
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if string(buf[:n]) != "1 2 3\nGET / HTTP/1.1\r\nHeader: 1\r\n\r\n" {
+		t.Error("Message not properly decoded: ", string(buf[:n]), n)
+	}
+}

input_raw.go

@@ -1,11 +1,12 @@
 package main
 
 import (
-	"github.com/buger/gor/proto"
-	raw "github.com/buger/gor/raw_socket_listener"
 	"log"
 	"net"
 	"time"
+
+	"github.com/buger/goreplay/proto"
+	raw "github.com/buger/goreplay/raw_socket_listener"
 )
 
 // RAWInput used for intercepting traffic for given address
@@ -18,24 +19,31 @@ type RAWInput struct {
 	realIPHeader  []byte
 	trackResponse bool
 	listener      *raw.Listener
+	bpfFilter     string
+	timestampType string
+	bufferSize    int
 }
 
 // Available engines for intercepting traffic
 const (
 	EngineRawSocket = 1 << iota
 	EnginePcap
+	EnginePcapFile
 )
 
 // NewRAWInput constructor for RAWInput. Accepts address with port as argument.
-func NewRAWInput(address string, engine int, trackResponse bool, expire time.Duration, realIPHeader string) (i *RAWInput) {
+func NewRAWInput(address string, engine int, trackResponse bool, expire time.Duration, realIPHeader string, bpfFilter string, timestampType string, bufferSize int) (i *RAWInput) {
 	i = new(RAWInput)
 	i.data = make(chan *raw.TCPMessage)
 	i.address = address
 	i.expire = expire
 	i.engine = engine
+	i.bpfFilter = bpfFilter
 	i.realIPHeader = []byte(realIPHeader)
 	i.quit = make(chan bool)
 	i.trackResponse = trackResponse
+	i.timestampType = timestampType
+	i.bufferSize = bufferSize
 
 	i.listen(address)
 	i.listener.IsReady()
@@ -50,12 +58,12 @@ func (i *RAWInput) Read(data []byte) (int, error) {
 	var header []byte
 
 	if msg.IsIncoming {
-		header = payloadHeader(RequestPayload, msg.UUID(), msg.Start.UnixNano())
+		header = payloadHeader(RequestPayload, msg.UUID(), msg.Start.UnixNano(), -1)
 		if len(i.realIPHeader) > 0 {
 			buf = proto.SetHeader(buf, i.realIPHeader, []byte(msg.IP().String()))
 		}
 	} else {
-		header = payloadHeader(ResponsePayload, msg.UUID(), msg.End.UnixNano()-msg.AssocMessage.Start.UnixNano())
+		header = payloadHeader(ResponsePayload, msg.UUID(), msg.Start.UnixNano(), msg.End.UnixNano()-msg.AssocMessage.End.UnixNano())
 	}
 
 	copy(data[0:len(header)], header)
@@ -73,7 +81,7 @@ func (i *RAWInput) listen(address string) {
 		log.Fatal("input-raw: error while parsing address", err)
 	}
 
-	i.listener = raw.NewListener(host, port, i.engine, i.trackResponse, i.expire)
+	i.listener = raw.NewListener(host, port, i.engine, i.trackResponse, i.expire, i.bpfFilter, i.timestampType, i.bufferSize, Settings.inputRAWOverrideSnapLen, Settings.inputRAWImmediateMode)
 
 	ch := i.listener.Receiver()
 

input_raw_test.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"bytes"
-	"github.com/buger/gor/proto"
 	"io"
 	"io/ioutil"
 	"log"
@@ -19,6 +18,8 @@ import (
 	"sync/atomic"
 	"testing"
 	"time"
+
+	"github.com/buger/goreplay/proto"
 )
 
 const testRawExpire = time.Millisecond * 200
@@ -43,7 +44,7 @@ func TestRAWInputIPv4(t *testing.T) {
 
 	var respCounter, reqCounter int64
 
-	input := NewRAWInput(originAddr, EnginePcap, true, testRawExpire, "X-Real-IP")
+	input := NewRAWInput(originAddr, EnginePcap, true, testRawExpire, "X-Real-IP", "", "", 0)
 	defer input.Close()
 
 	output := NewTestOutput(func(data []byte) {
@@ -79,6 +80,55 @@ func TestRAWInputIPv4(t *testing.T) {
 	}
 
 	wg.Wait()
+
+	close(quit)
+}
+
+func TestRAWInputNoKeepAlive(t *testing.T) {
+	wg := new(sync.WaitGroup)
+	quit := make(chan int)
+
+	listener, err := net.Listen("tcp", ":0")
+	if err != nil {
+		t.Fatal(err)
+	}
+	origin := &http.Server{
+		Handler: http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			w.Write([]byte("a"))
+			w.Write([]byte("b"))
+		}),
+		ReadTimeout:  10 * time.Second,
+		WriteTimeout: 10 * time.Second,
+	}
+	origin.SetKeepAlivesEnabled(false)
+	go origin.Serve(listener)
+	defer listener.Close()
+
+	originAddr := listener.Addr().String()
+
+	input := NewRAWInput(originAddr, EnginePcap, true, testRawExpire, "", "", "", 0)
+	defer input.Close()
+
+	output := NewTestOutput(func(data []byte) {
+		wg.Done()
+	})
+
+	Plugins.Inputs = []io.Reader{input}
+	Plugins.Outputs = []io.Writer{output}
+
+	client := NewHTTPClient("http://"+listener.Addr().String(), &HTTPClientConfig{})
+
+	go Start(quit)
+
+	for i := 0; i < 100; i++ {
+		// request + response
+		wg.Add(2)
+		client.Get("/")
+		time.Sleep(2 * time.Millisecond)
+	}
+
+	wg.Wait()
+
 	close(quit)
 }
 
@@ -102,7 +152,7 @@ func TestRAWInputIPv6(t *testing.T) {
 
 	var respCounter, reqCounter int64
 
-	input := NewRAWInput(originAddr, EnginePcap, true, testRawExpire, "")
+	input := NewRAWInput(originAddr, EnginePcap, true, testRawExpire, "", "", "", 0)
 	defer input.Close()
 
 	output := NewTestOutput(func(data []byte) {
@@ -153,7 +203,7 @@ func TestInputRAW100Expect(t *testing.T) {
 
 	originAddr := strings.Replace(origin.Listener.Addr().String(), "[::]", "127.0.0.1", -1)
 
-	input := NewRAWInput(originAddr, EnginePcap, true, time.Second, "")
+	input := NewRAWInput(originAddr, EnginePcap, true, time.Second, "", "", "", 0)
 	defer input.Close()
 
 	// We will use it to get content of raw HTTP request
@@ -216,7 +266,7 @@ func TestInputRAWChunkedEncoding(t *testing.T) {
 	}))
 
 	originAddr := strings.Replace(origin.Listener.Addr().String(), "[::]", "127.0.0.1", -1)
-	input := NewRAWInput(originAddr, EnginePcap, true, time.Second, "")
+	input := NewRAWInput(originAddr, EnginePcap, true, time.Second, "", "", "", 0)
 	defer input.Close()
 
 	replay := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
@@ -280,7 +330,7 @@ func TestInputRAWLargePayload(t *testing.T) {
 	}))
 	originAddr := strings.Replace(origin.Listener.Addr().String(), "[::]", "127.0.0.1", -1)
 
-	input := NewRAWInput(originAddr, EnginePcap, true, testRawExpire, "")
+	input := NewRAWInput(originAddr, EnginePcap, true, testRawExpire, "", "", "", 0)
 	defer input.Close()
 
 	replay := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
@@ -325,7 +375,7 @@ func BenchmarkRAWInput(b *testing.B) {
 
 	var respCounter, reqCounter int64
 
-	input := NewRAWInput(originAddr, EnginePcap, true, testRawExpire, "")
+	input := NewRAWInput(originAddr, EnginePcap, true, testRawExpire, "", "", "", 0)
 	defer input.Close()
 
 	output := NewTestOutput(func(data []byte) {

input_tcp.go

@@ -3,6 +3,7 @@ package main
 import (
 	"bufio"
 	"bytes"
+	"crypto/tls"
 	"fmt"
 	"io"
 	"log"
@@ -13,15 +14,23 @@ import (
 // TCPInput used for internal communication
 type TCPInput struct {
 	data     chan []byte
-	address  string
 	listener net.Listener
+	address  string
+	config   *TCPInputConfig
+}
+
+type TCPInputConfig struct {
+	secure          bool
+	certificatePath string
+	keyPath         string
 }
 
 // NewTCPInput constructor for TCPInput, accepts address with port
-func NewTCPInput(address string) (i *TCPInput) {
+func NewTCPInput(address string, config *TCPInputConfig) (i *TCPInput) {
 	i = new(TCPInput)
 	i.data = make(chan []byte, 1000)
 	i.address = address
+	i.config = config
 
 	i.listen(address)
 
@@ -36,16 +45,30 @@ func (i *TCPInput) Read(data []byte) (int, error) {
 }
 
 func (i *TCPInput) listen(address string) {
-	listener, err := net.Listen("tcp", address)
-	i.listener = listener
+	if i.config.secure {
+		cer, err := tls.LoadX509KeyPair(i.config.certificatePath, i.config.keyPath)
+		if err != nil {
+			log.Fatal("Error while loading --input-file certificate:", err)
+		}
 
-	if err != nil {
-		log.Fatal("Can't start:", err)
+		config := &tls.Config{Certificates: []tls.Certificate{cer}}
+		listener, err := tls.Listen("tcp", address, config)
+		if err != nil {
+			log.Fatal("Can't start --input-tcp with secure connection:", err)
+		}
+		i.listener = listener
+	} else {
+		listener, err := net.Listen("tcp", address)
+		if err != nil {
+			log.Fatal("Can't start:", err)
+		}
+
+		i.listener = listener
 	}
 
 	go func() {
 		for {
-			conn, err := listener.Accept()
+			conn, err := i.listener.Accept()
 
 			if err != nil {
 				log.Println("Error while Accept()", err)

input_tcp_test.go

@@ -1,18 +1,28 @@
 package main
 
 import (
+	"bytes"
+	"crypto/rand"
+	"crypto/rsa"
+	"crypto/tls"
+	"crypto/x509"
+	"encoding/pem"
 	"io"
+	"io/ioutil"
 	"log"
+	"math/big"
 	"net"
+	"os"
 	"sync"
 	"testing"
+	"time"
 )
 
 func TestTCPInput(t *testing.T) {
 	wg := new(sync.WaitGroup)
 	quit := make(chan int)
 
-	input := NewTCPInput("127.0.0.1:0")
+	input := NewTCPInput("127.0.0.1:0", &TCPInputConfig{})
 	output := NewTestOutput(func(data []byte) {
 		wg.Done()
 	})
@@ -46,3 +56,81 @@ func TestTCPInput(t *testing.T) {
 
 	close(quit)
 }
+
+func genCertificate(template *x509.Certificate) ([]byte, []byte) {
+	priv, _ := rsa.GenerateKey(rand.Reader, 2048)
+
+	serialNumberLimit := new(big.Int).Lsh(big.NewInt(1), 128)
+	serialNumber, _ := rand.Int(rand.Reader, serialNumberLimit)
+	template.SerialNumber = serialNumber
+	template.BasicConstraintsValid = true
+	template.NotBefore = time.Now()
+	template.NotAfter = time.Now().Add(time.Hour)
+
+	derBytes, _ := x509.CreateCertificate(rand.Reader, template, template, &priv.PublicKey, priv)
+
+	var certPem, keyPem bytes.Buffer
+	pem.Encode(&certPem, &pem.Block{Type: "CERTIFICATE", Bytes: derBytes})
+	pem.Encode(&keyPem, &pem.Block{Type: "RSA PRIVATE KEY", Bytes: x509.MarshalPKCS1PrivateKey(priv)})
+
+	return certPem.Bytes(), keyPem.Bytes()
+}
+
+func TestTCPInputSecure(t *testing.T) {
+	serverCertPem, serverPrivPem := genCertificate(&x509.Certificate{
+		DNSNames:    []string{"localhost"},
+		IPAddresses: []net.IP{net.ParseIP("127.0.0.1"), net.ParseIP("::")},
+	})
+
+	serverCertPemFile, _ := ioutil.TempFile("", "server.crt")
+	serverCertPemFile.Write(serverCertPem)
+	serverCertPemFile.Close()
+
+	serverPrivPemFile, _ := ioutil.TempFile("", "server.key")
+	serverPrivPemFile.Write(serverPrivPem)
+	serverPrivPemFile.Close()
+
+	defer func() {
+		os.Remove(serverPrivPemFile.Name())
+		os.Remove(serverCertPemFile.Name())
+	}()
+
+	wg := new(sync.WaitGroup)
+	quit := make(chan int)
+
+	input := NewTCPInput("127.0.0.1:0", &TCPInputConfig{
+		secure:          true,
+		certificatePath: serverCertPemFile.Name(),
+		keyPath:         serverPrivPemFile.Name(),
+	})
+	output := NewTestOutput(func(data []byte) {
+		wg.Done()
+	})
+
+	Plugins.Inputs = []io.Reader{input}
+	Plugins.Outputs = []io.Writer{output}
+
+	go Start(quit)
+
+	conf := &tls.Config{
+		InsecureSkipVerify: true,
+	}
+
+	conn, err := tls.Dial("tcp", input.listener.Addr().String(), conf)
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer conn.Close()
+
+	msg := []byte("1 1 1\nGET / HTTP/1.1\r\n\r\n")
+
+	for i := 0; i < 100; i++ {
+		wg.Add(1)
+		conn.Write(msg)
+		conn.Write([]byte(payloadSeparator))
+	}
+
+	wg.Wait()
+
+	close(quit)
+}

kafka.go

@@ -0,0 +1,51 @@
+package main
+
+import (
+	"bytes"
+	"fmt"
+
+	"github.com/buger/goreplay/proto"
+
+	"github.com/Shopify/sarama"
+)
+
+// KafkaConfig should contains required information to
+// build producers.
+type KafkaConfig struct {
+	host     string
+	topic    string
+	producer sarama.AsyncProducer
+	consumer sarama.Consumer
+	useJSON  bool
+}
+
+// KafkaMessage should contains catched request information that should be
+// passed as Json to Apache Kafka.
+type KafkaMessage struct {
+	ReqURL     string            `json:"Req_URL"`
+	ReqType    string            `json:"Req_Type"`
+	ReqID      string            `json:"Req_ID"`
+	ReqTs      string            `json:"Req_Ts"`
+	ReqMethod  string            `json:"Req_Method"`
+	ReqBody    string            `json:"Req_Body,omitempty"`
+	ReqHeaders map[string]string `json:"Req_Headers,omitempty"`
+}
+
+// Dump returns the given request in its HTTP/1.x wire
+// representation.
+func (m KafkaMessage) Dump() ([]byte, error) {
+	var b bytes.Buffer
+
+	b.WriteString(fmt.Sprintf("%s %s %s\n", m.ReqType, m.ReqID, m.ReqTs))
+	b.WriteString(fmt.Sprintf("%s %s HTTP/1.1", m.ReqMethod, m.ReqURL))
+	b.Write(proto.CLRF)
+	for key, value := range m.ReqHeaders {
+		b.WriteString(fmt.Sprintf("%s: %s", key, value))
+		b.Write(proto.CLRF)
+	}
+
+	b.Write(proto.CLRF)
+	b.WriteString(m.ReqBody)
+
+	return b.Bytes(), nil
+}

limiter.go

@@ -82,7 +82,11 @@ func (l *Limiter) Write(data []byte) (n int, err error) {
 }
 
 func (l *Limiter) Read(data []byte) (n int, err error) {
-	n, err = l.plugin.(io.Reader).Read(data)
+	if r, ok := l.plugin.(io.Reader); ok {
+		n, err = r.Read(data)
+	} else {
+		return 0, nil
+	}
 
 	if l.isLimited() {
 		return 0, nil
@@ -92,5 +96,5 @@ func (l *Limiter) Read(data []byte) (n int, err error) {
 }
 
 func (l *Limiter) String() string {
-	return fmt.Sprintf("Limiting %s to: %d (isPercent: %b)", l.plugin, l.limit, l.isPercent)
+	return fmt.Sprintf("Limiting %s to: %d (isPercent: %v)", l.plugin, l.limit, l.isPercent)
 }

middleware.go

@@ -34,9 +34,7 @@ func NewMiddleware(command string) *Middleware {
 	m.Stdout, _ = cmd.StdoutPipe()
 	m.Stdin, _ = cmd.StdinPipe()
 
-	if Settings.verbose {
-		cmd.Stderr = os.Stderr
-	}
+	cmd.Stderr = os.Stderr
 
 	go m.read(m.Stdout)
 
@@ -64,23 +62,40 @@ func (m *Middleware) ReadFrom(plugin io.Reader) {
 
 func (m *Middleware) copy(to io.Writer, from io.Reader) {
 	buf := make([]byte, 5*1024*1024)
-	dst := make([]byte, len(buf)*2)
+	dst := make([]byte, len(buf)*4)
 
 	for {
 		nr, _ := from.Read(buf)
-		if nr > 0 && len(buf) > nr {
+		if nr == 0 || nr > len(buf) {
+			continue
+		}
 
-			hex.Encode(dst, buf[0:nr])
-			dst[nr*2] = '\n'
+		payload := buf[0:nr]
 
-			m.mu.Lock()
-			to.Write(dst[0 : nr*2+1])
-			m.mu.Unlock()
+		if Settings.prettifyHTTP {
+			payload = prettifyHTTP(payload)
+			nr = len(payload)
 
-			if Settings.debug {
-				Debug("[MIDDLEWARE-MASTER] Sending:", string(buf[0:nr]), "From:", from)
+			if nr*2 > len(dst) {
+				continue
 			}
 		}
+
+		if Settings.prettifyHTTP {
+			payload = prettifyHTTP(payload)
+			nr = len(payload)
+		}
+
+		hex.Encode(dst, payload)
+		dst[nr*2] = '\n'
+
+		m.mu.Lock()
+		to.Write(dst[0 : nr*2+1])
+		m.mu.Unlock()
+
+		if Settings.debug {
+			Debug("[MIDDLEWARE-MASTER] Sending:", string(buf[0:nr]), "From:", from)
+		}
 	}
 }
 

middleware/README.md

@@ -0,0 +1,122 @@
+# GoReplay middleware
+
+GoReplay support protocol for writing middleware in any language, which allows you to implement custom logic like authentification or complex rewriting and filterting. See protocol description here: https://github.com/buger/goreplay/wiki/Middleware, but the basic idea that middleware process receive hex encoded data via STDIN and emits it back via STDOUT. STDERR for loggin inside middleware. Yes, that's simple.
+
+To simplify middleware creation we provide packages for NodeJS and Go (upcoming).
+
+If you want to get access to original and replayed responses, do not forget adding `--output-http-track-respose` and `--input-raw-track-response` options.
+
+## NodeJS
+
+Before starting, you should install the package via npm: `npm install goreplay_middleware`.
+And initialize middleware the following way:
+```javascript
+var gor = require("goreplay_middleware");
+// `init` will initialize STDIN listener
+gor.init();
+```
+
+Basic idea is that you write callbacks which respond to `request`, `response`, `replay`, or `message` events, which contain request meta information and actuall http paylod. Depending on your needs you may compare, override or filter incoming requests and responses.
+
+You can respond to the incoming events using `on` function, by providing callbacks:
+```javascript
+// valid events are `request`, `response` (original response), `replay` (replayed response), and `message` (all events)
+gor.on('request', function(data) {
+    // `data` contains incoming message its meta information.
+    data
+
+    // Raw HTTP payload of `Buffer` type
+    // Example (hidden character for line endings shown on purpose):
+    //   GET / HTTP/1.1\r\n
+    //   User-Agent: Golang\r\n
+    //   \r\n
+    data.http
+
+    // Meta is an array size of 4, containing:
+    //   1. request type - 1, 2 or 3 (which maps to `request`, `respose` and `replay`)
+    //   2. uuid - request unique identifier. Request responses have the same ID as their request.
+    //   3. timestamp of when request was made (for responses it is time of request start too)
+    //   4. latency - time difference between request start and finish. For `request` is zero.
+    data.meta
+
+    // Unique request ID. It should be same for `request`, `response` and `replay` events of the same request.
+    data.ID
+
+    // You should return data at the end of function, even if you not changed request, if you do not want to filter it out.
+    // If you just `return` nothing, request will be filtered
+    return data
+})
+```
+### Mapping requests and responses
+You can provide request ID as additional argument to `on` function, which allow you to map related requests and responses. Below is example of middleware which checks that original and replayed response have same HTTP status code.
+
+```javascript
+// Example of very basic way to compare if replayed traffic have no errors
+gor.on("request", function(req) {
+    gor.on("response", req.ID, function(resp) {
+        gor.on("replay", req.ID, function(repl) {
+            if (gor.httpStatus(resp.http) != gor.httpStatus(repl.http)) {
+                // Note that STDERR is used for logging, and it actually will be send to `Gor` STDOUT.
+                // This trick is used because SDTIN and STDOUT already used for process communication.
+                // You can write logger that writes to files insead.
+                console.error(`${gor.httpPath(req.http)} STATUS NOT MATCH: 'Expected ${gor.httpStatus(resp.http)}' got '${gor.httpStatus(repl.http)}'`)
+            }
+            return repl;
+        })
+        return resp;
+    })
+    return req
+})
+```
+
+This middleware includes `searchResponses` helper which is used to compare value of original response with the replayed response. If authentication system or xsrf protection returns unique tokens in headers or the response, it will be helpful to rewrite your requests based on them. Because tokens are unique, and the value contained in original and replayed responses will be different. So, you need to extract value from both responses, and rewrite requests based on those mappings.
+
+`searchResponses` accepts request id, regexp pattern for searching the compared value (should include capture group), and callback which returns both original and replayed matched value.
+
+Example: 
+```javascript
+   // Compare HTTP headers for response and replayed response, and map values
+let tokMap = {};
+
+gor.on("request", function(req) {
+    let tok = gor.httpHeader(req.http, "Auth-Token");
+    if (tok && tokMap[tok]) {
+        req.http = gor.setHttpHeader(req.http, "Auth-Token", tokMap[tok]) 
+    }
+    
+    gor.searchResponses(req.ID, "X-Set-Token: (\w+)$", function(respTok, replTok) {
+        if (respTok && replTok) tokMap[respTok] = replTok;
+    })
+
+    return req;
+})
+```
+
+
+### API documentation
+
+Package expose following functions to process raw HTTP payloads:
+* `init` - initialize middleware object, start reading from STDIN.
+* `httpPath` - URL path of the request: `gor.httpPath(req.http)`
+* `httpMethod` - Http method: 'GET', 'POST', etc. `gor.httpMethod(req.http)`. 
+* `setHttpPath` - update URL path: `req.http = gor.setHttpPath(req.http, newPath)`
+* `httpPathParam` - get param from URL path: `gor.httpPathParam(req.http, queryParam)`
+* `setHttpPathParam` - set URL param: `req.http = gor.setHttpPathParam(req.http, queryParam, value)` 
+* `httpStatus` - response status code
+* `httpHeaders` - get all headers: `gor.httpHeaders(req.http)`
+* `httpHeader` - get HTTP header: `gor.httpHeader(req.http, "Content-Length")`
+* `setHttpHeader` - Set HTTP header, returns modified payload: `req.http = gor.setHttpHeader(req.http, "X-Replayed", "1")`
+* `httpBody` - get HTTP Body: `gor.httpBody(req.http)`
+* `setHttpBody` - Set HTTP Body and ensures that `Content-Length` header have proper value. Returns modified payload: `req.http = gor.setHttpBody(req.http, Buffer.from('hello!'))`.
+* `httpBodyParam` - get POST body param: `gor.httpBodyParam(req.http, param)`
+* `setHttpBodyParam` - set POST body param: `req.http = gor.setHttpBodyParam(req.http, param, value)`
+* `httpCookie` - get HTTP cookie: `gor.httpCookie(req.http, "SESSSION_ID")`
+* `setHttpCookie` - set HTTP cookie, returns modified payload: `req.http = gor.setHttpCookie(req.http, "iam", "cuckoo")`
+* `deleteHttpCookie` - delete HTTP cookie, returns modified payload: `req.http = gor.deleteHttpCookie(req.http, "iam")`
+
+Also it is totally legit to use standard `Buffer` functions like `indexOf` for processing the HTTP payload. Just do not forget that if you modify the body, update the `Content-Length` header with a new value. And if you modify any of the headers, line endings should be `\r\n`. Rest is up to your imagination.
+
+
+## Support
+
+Feel free to ask questions here and by sending email to [support@goreplay.org](mailto:support@goreplay.org). Commercial support is available and welcomed 🙈.

middleware/middleware.js

@@ -0,0 +1,779 @@
+// ======= GoReplay Middleware helper =============
+// Created by Leonid Bugaev in 2017
+//
+// For questions use GitHub or support@goreplay.org
+//
+// GoReplay: https://github.com/buger/goreplay
+// Middleware package: https://github.com/buger/goreplay/middleware
+
+var middleware;
+
+function init() {
+    var proxy = {
+        ch: {},
+        on: function(chan, id, cb) {
+            if (!cb && id) {
+                cb = id;
+            } else if (cb && id) {
+                chan = chan + "#" + id;
+            }
+
+            if (!proxy.ch[chan]) {
+                proxy.ch[chan] = [];
+            }
+
+            proxy.ch[chan].push({
+                created: new Date(),
+                cb: cb
+            });
+
+            return proxy;
+        },
+
+        emit: function(msg, raw) {
+            var chanPrefix;
+
+            switch(msg.type) {
+                case "1": chanPrefix = "request"; break;
+                case "2": chanPrefix = "response"; break;
+                case "3": chanPrefix = "replay"; break;
+            }
+
+            let resp = msg;
+
+            ["message", chanPrefix, chanPrefix + "#" + msg.ID].forEach(function(chanID, idx){
+                if (proxy.ch[chanID]) {
+                    proxy.ch[chanID].forEach(function(ch){
+                        let r = ch.cb(msg);
+                        if (resp) resp = r; // If one of callback decided not to send response back, do not override it in global callbacks
+                    })
+                    
+                    // Cleanup Individual message channels to avoid memory leaks
+                    if (idx == 2) {
+                        delete proxy.ch[chanID]
+                    }
+                }
+            })
+
+            if (resp) {
+              process.stdout.write(`${resp.rawMeta.toString('hex')}${Buffer.from("\n").toString("hex")}${resp.http.toString('hex')}\n`)
+            }
+
+            return resp
+        }
+    }
+
+    // Clean up old messaged ID specific channels if they are older then 60s
+    let gc = function(gcTime){
+        let now = new Date();
+        for (k in proxy.ch) {
+            if (k.indexOf("#") == -1) continue;
+
+            proxy.ch[k] = proxy.ch[k].filter(function(ch){
+                return (now - ch.created) < gcTime
+            })
+
+            if (proxy.ch[k].length == 0) {
+                delete proxy.ch[k]
+            }
+        }
+    }
+    proxy.gc = gc
+
+    setInterval(function(){
+        gc(10 * 1000)
+    }, 1000);
+
+    const readline = require('readline');
+    const rl = readline.createInterface({
+          input: process.stdin
+    });
+
+    rl.on('line', function(line) {
+        let msg = parseMessage(line)
+        if (msg) {
+            proxy.emit(msg, line)
+        }
+    });
+
+    middleware = proxy;
+
+    return proxy;
+}
+
+
+function parseMessage(msg) {
+    try {
+        let payload = Buffer.from(msg, "hex");
+        let metaPos = payload.indexOf("\n");
+        let meta = payload.slice(0, metaPos);
+        let metaArr = meta.toString("ascii").split(" ");
+        let pType = metaArr[0];
+        let pID = metaArr[1];
+        let raw = payload.slice(metaPos + 1, payload.length);
+
+        return {
+            type: pType,
+            ID: pID,
+            rawMeta: meta,
+            meta: metaArr,
+            http: raw
+        }
+    } catch(e) {
+        fail(`Error while parsing incoming request: ${msg}`)
+    }
+}
+
+// Used to compare values from original and replayed responses
+// Accepts request id, regexp pattern for searching the compared value (should include capture group), and callback which returns both original and replayed matched value.
+// Example: 
+//
+//   // Compare HTTP headers for response and replayed response, and map values
+//   let tokMap = {};
+//
+//   gor.on("request", function(req) {
+//     let tok = gor.httpHeader(req.http, "Auth-Token");
+//     if (tok && tokMap[tok]) {
+//       req.http = gor.setHttpHeader(req.http, "Auth-Token", tokMap[tok]) 
+//     }
+//
+//     gor.searchResponses(req.ID, "X-Set-Token: (\w+)$", function(respTok, replTok) {
+//       tokMap[respTok] = replTok;
+//     })
+//
+//     return req;
+//   })
+//
+function searchResponses(id, searchPattern, callback) {
+    let re = new RegExp(searchPattern);
+
+    // Using regexp require converting buffer to string
+    // Before converting to string we can use initial `Buffer.indexOf` check
+    let indexPattern = searchPattern.split("(")[0];
+
+    if (!indexPattern) {
+        console.error("Search regexp should include capture group, pointing to the value: `prefix-(.*)`")
+        return
+    }
+
+    middleware.on("response", id, function(resp){
+        if (resp.http.indexOf(indexPattern) == -1) {
+            callback()
+            return resp
+        }
+
+        let respMatch = resp.http.toString('utf-8').match(re);
+        if (!respMatch) {
+            callback()
+            return resp
+        }
+
+        middleware.on("replay", id, function(repl) {
+            if (repl.http.indexOf(indexPattern) == -1) {
+                callback(respMatch[1]);
+                return repl;
+            }
+
+            let replMatch = repl.http.toString('utf-8').match(re);
+
+            if (!replMatch) {
+                callback(respMatch[1]);
+                return repl;
+            }
+        
+            callback(respMatch[1], replMatch[1]);
+            
+            return repl;
+        })
+
+        return resp;
+    })
+}
+
+
+// =========== HTTP parsing =================
+
+// Example HTTP payload record (including hidden characters):
+//
+//  POST / HTTP/1.1\r\n
+//  User-Agent: Node\r\n
+//  Content-Length: 5\r\n
+//  \r\n
+//  hello
+
+function httpMethod(payload) {
+    var pEnd = payload.indexOf(' ');
+    return payload.slice(0, pEnd).toString("ascii");
+}
+
+function httpPath(payload) {
+    var pStart = payload.indexOf(' ') + 1;
+    var pEnd = payload.indexOf(' ', pStart);
+    return payload.slice(pStart, pEnd).toString("ascii");
+}
+
+function setHttpPath(payload, newPath) {
+    var pStart = payload.indexOf(' ') + 1;
+    var pEnd = payload.indexOf(' ', pStart);
+
+    return Buffer.concat([payload.slice(0, pStart), Buffer.from(newPath), payload.slice(pEnd, payload.length)])
+}
+
+function httpPathParam(payload, name) {
+    let path = httpPath(payload);
+    let re = new RegExp(name + "=([^&$]+)");
+    let match = path.match(re);
+
+    if (match) return decodeURI(match[1]);
+}
+
+function setHttpPathParam(payload, name, value) {
+    let path = httpPath(payload);
+    let re = new RegExp(name + "=([^&$]+)");
+    let newPath = path.replace(re, name + "=" + encodeURI(value));
+    
+    // If we should add new param instead
+    if (newPath == path) {
+        if (newPath.indexOf("?") == -1) {
+            newPath += "?"
+        } else {
+            newPath += "&"
+        }
+
+        newPath += name + "=" + encodeURI(value);
+    }
+
+    return setHttpPath(payload, newPath)
+}
+
+// HTTP response have status code in same position as `path` for requests
+function httpStatus(payload) {
+    return httpPath(payload);
+}
+
+function setHttpStatus(payload, newStatus) {
+    return setHttpPath(payload, newStatus);
+}
+
+function httpHeaders(payload) {
+    var httpHeaderString = payload.slice(0,payload.indexOf("\r\n\r\n") + 4).toString().split("\n").slice(1);
+    var headers = {};
+
+    for (var item in httpHeaderString) {
+        var parts = httpHeaderString[item].split(":");
+
+        if (parts.length > 1) {
+            headers[parts[0]] = parts.slice(1).join(":").trim();    
+        }
+    }
+
+    return headers;
+}
+
+function httpHeader(payload, name) {
+    var currentLine = 0;
+    var i = 0;
+    var header = { start: -1, end: -1, valueStart: -1 }
+    var nameBuf = Buffer.from(name);
+    var nameBufLower = Buffer.from(name.toLowerCase());
+
+    while(c = payload[i]) {
+        if (c == 13) { // new line "\n"
+            currentLine++;
+            i++
+            header.end = i
+
+            if (currentLine > 0 && header.start > 0 && header.valueStart > 0) {
+                if (nameBuf.compare(payload, header.start, header.valueStart - 1) == 0 ||
+                    nameBufLower.compare(payload, header.start, header.valueStart - 1) == 0) { // ensure that headers are not case sensitive
+                    header.value = payload.slice(header.valueStart, header.end - 1).toString("utf-8").trim();
+                    header.name = payload.slice(header.start, header.valueStart - 1).toString("utf-8");
+                    return header
+                }
+            }
+
+            header.start = -1
+            header.valueStart = -1
+            continue;
+        } else if (c == 10) { // "\r"
+            i++
+            continue;
+        } else if (c == 58) { // ":" Header/value separator symbol
+            if (header.valueStart == -1) {
+                header.valueStart = i + 1;
+                i++
+                continue;
+            }
+        }
+
+        if (header.start == -1) header.start = i;
+
+        i++
+    }
+
+    return
+}
+
+function setHttpHeader(payload, name, value) {
+    let header = httpHeader(payload, name);
+    if (!header) {
+        let headerStart = payload.indexOf(13) + 1;
+        return Buffer.concat([payload.slice(0, headerStart + 1), Buffer.from(name + ": " + value + "\r\n"), payload.slice(headerStart + 1, payload.length)])
+    } else {
+        return Buffer.concat([payload.slice(0, header.valueStart), Buffer.from(" " + value + "\r\n"), payload.slice(header.end + 1, payload.length)])
+    }
+}
+
+function deleteHttpHeader(payload, name) {
+	let header = httpHeader(payload, name);
+
+    if (header) {
+        return Buffer.concat([payload.slice(0, header.start), payload.slice(header.end+1, payload.length)])
+    }
+
+	return payload
+}
+
+function httpBody(payload) {
+    return payload.slice(payload.indexOf("\r\n\r\n") + 4, payload.length);
+}
+
+function setHttpBody(payload, newBody) {
+    let p = setHttpHeader(payload, "Content-Length", newBody.length)
+    let headerEnd = p.indexOf("\r\n\r\n") + 4;
+    return Buffer.concat([p.slice(0, headerEnd), newBody])
+}
+
+function httpBodyParam(payload, name) {
+    let body = httpBody(payload);
+    let re = new RegExp(name + "=([^&$]+)");
+    if (body.indexOf(name + "=") != -1) {
+        let param = body.toString('utf-8').match(re);
+        if (param) {
+            return decodeURI(param[1]);
+        }
+    }
+}
+
+function setHttpBodyParam(payload, name, value) {
+    let body = httpBody(payload);
+    let re = new RegExp(name + "=([^&$]+)");
+
+    let newBody = body.toString('utf-8');
+
+    if (newBody.indexOf(name + "=") != -1 ) {
+        newBody = newBody.replace(re, name + "=" + encodeURI(value));
+    } else {
+        if (newBody.indexOf("=") != -1) {
+            newBody += "&";
+        }
+        newBody += name + "=" + value;
+    }
+    
+    return setHttpBody(payload, Buffer.from(newBody));
+}
+
+function setHttpCookie(payload, name, value) {
+    let h = httpHeader(payload, "Cookie");
+    let cookie = h ? h.value : "";
+    let cookies = cookie.split("; ").filter(function(v){ return v.indexOf(name + "=") != 0 })
+    cookies.push(name + "=" + value)
+    return setHttpHeader(payload, "Cookie", cookies.join("; "))
+}
+
+function deleteHttpCookie(payload, name) {
+    let h = httpHeader(payload, "Cookie");
+    let cookie = h ? h.value : "";
+    let cookies = cookie.split("; ").filter(function(v){ return v.indexOf(name + "=") != 0 })
+    return setHttpHeader(payload, "Cookie", cookies.join("; "))
+}
+
+function httpCookie(payload, name) {
+    let h = httpHeader(payload, "Cookie");
+    let cookie = h ? h.value : "";
+    let value;
+    let cookies = cookie.split("; ").forEach(function(v){
+        if (v.indexOf(name + "=") == 0) {
+            value = v.substr(name.length + 1);
+        }
+    })
+    return value;
+}
+
+module.exports = {
+    init: init,
+    on: function(){ return middleware.on.apply(this, arguments) },
+    parseMessage: parseMessage,
+    searchResponses: searchResponses,
+    httpPath: httpPath,
+    httpMethod: httpMethod,
+    setHttpPath: setHttpPath,
+    httpPathParam: httpPathParam,
+    setHttpPathParam: setHttpPathParam,
+    httpStatus: httpStatus,
+    setHttpStatus: setHttpStatus,
+    httpHeader: httpHeader,
+    setHttpHeader: setHttpHeader,
+    deleteHttpHeader: deleteHttpHeader,
+    httpBody: httpBody,
+    setHttpBody: setHttpBody,
+    httpBodyParam: httpBodyParam,
+    setHttpBodyParam: setHttpBodyParam,
+    httpCookie: httpCookie,
+    setHttpCookie: setHttpCookie,
+    deleteHttpCookie: deleteHttpCookie,
+    test: testRunner,
+    benchmark: testBenchmark,
+    httpHeaders: httpHeaders
+}
+
+
+// =========== Tests ==============
+
+function testRunner(){
+    ["init", "filter", "parseMessage", "httpMethod", "httpPath", "setHttpHeader", "deleteHttpHeader", "httpPathParam", "httpHeader", "httpBody", "setHttpBody", "httpBodyParam", "httpCookie", "setHttpCookie", "deleteHttpCookie", "httpHeaders"].forEach(function(t){
+        console.log(`====== Start ${t} =======`)
+        eval(`TEST_${t}()`)
+        console.log(`====== End ${t} =======`)
+    })
+}
+
+function testBenchmark(){
+    const child_process = require('child_process');
+
+    let gor = init();
+    gor.on("message", function(){
+    });
+
+    gor.on("request", function(){
+    });
+
+    for (var i = 0; i<256; i++) {
+        let req = parseMessage(Buffer.from("1 2 3\nGET / HTTP/1.1\r\n\r\n").toString('hex'));
+        req.ID = +Date.now()
+        gor.emit(req);
+
+        gor.on("request", req.ID+"", function(){
+            gor.on("response", req.ID+"", function(){
+            })
+        })
+
+        if ( i % 3 == 0 ) {
+            let resp = parseMessage(Buffer.from("2 2 3\nHTTP/1.1 200 OK\r\n\r\n").toString('hex'));
+            resp.ID = req.ID
+            gor.emit(resp);
+        }
+    }
+    
+    child_process.execSync("sleep 0.01");
+
+    gor.gc(1) 
+    
+    fail(JSON.stringify(gor.ch))
+}
+
+// Just print in red color
+function fail(message) {
+    console.error("\x1b[31m[MIDDLEWARE] %s\x1b[0m", message)
+}
+
+function log(message) {
+    console.error(message)
+}
+
+function TEST_init() {
+    const child_process = require('child_process');
+
+    let received = 0;
+    let gor = init();
+    gor.on("message", function(){
+        received++; // should be called 3 times for for every request
+    });
+
+    gor.on("request", function(){
+        received++; // should be called 1 time only for request
+    });
+
+    gor.on("response", "2", function(){
+        received++; // should be called 1 time only for specific response
+    })
+
+    if (Object.keys(gor.ch).length != 3) {
+        return fail("Should create 3 channels");
+    }
+
+    let req = parseMessage(Buffer.from("1 2 3\nGET / HTTP/1.1\r\n\r\n").toString('hex'));
+    let resp = parseMessage(Buffer.from("2 2 3\nHTTP/1.1 200 OK\r\n\r\n").toString('hex'));
+    let resp2 = parseMessage(Buffer.from("2 3 3\nHTTP/1.1 200 OK\r\n\r\n").toString('hex'));
+    
+    gor.emit(req);
+    gor.emit(resp);
+    gor.emit(resp2);
+
+    child_process.execSync("sleep 0.01");
+
+    if (received != 5) {
+        fail(`Should receive 5 messages: ${received}`);
+    }
+}
+
+function TEST_filter() {
+    const child_process = require('child_process');
+
+    let gor = init();
+    gor.on("request", function(req){
+        if (httpPath(req.http) != "/filter") {
+            return req
+        }
+    });
+
+    gor.on("request", function(req){
+        return req
+    });
+
+
+    let reqPass = parseMessage(Buffer.from("1 2 3\nGET / HTTP/1.1\r\n\r\n").toString('hex'));
+    let reqFilter = parseMessage(Buffer.from("1 2 3\nGET /filter HTTP/1.1\r\n\r\n").toString('hex'));
+    
+    if (!gor.emit(reqPass)) {
+        return fail("Should not filter request")
+    }
+
+    if (gor.emit(reqFilter)) {
+        return fail("Should filter request even if one middleware rejected it")
+    }
+
+}
+
+function TEST_parseMessage() {
+    const exampleMessage = Buffer.from("1 2 3\nGET / HTTP/1.1\r\n\r\n").toString('hex')
+    let msg = parseMessage(exampleMessage)
+    let expected = { type: '1', ID: '2', meta: ["1", "2", "3"], http: Buffer.from("GET / HTTP/1.1\r\n\r\n") }
+
+    Object.keys(expected).forEach(function(k){
+        if (msg[k].toString() != expected[k].toString()) {
+            fail(`${k}: '${expected[k]}' != '${msg[k]}'`)
+        }
+    })
+}
+
+function TEST_httpPath() {
+    const examplePayload = "GET /test HTTP/1.1\r\n\r\n";
+
+    let payload = Buffer.from(examplePayload);
+    let path = httpPath(payload);
+
+    if (path != "/test") {
+        return fail(`Path '${patj}' != '/test'`)
+    }
+
+    let newPayload = setHttpPath(payload, '/')
+    if (newPayload.toString() != "GET / HTTP/1.1\r\n\r\n") {
+        return fail(`Malformed payload '${newPayload}'`)
+    }
+
+    newPayload = setHttpPath(payload, '/bigger')
+    if (newPayload.toString() != "GET /bigger HTTP/1.1\r\n\r\n") {
+        return fail(`Malformed payload '${newPayload}'`)
+    }
+}
+
+function TEST_httpMethod() {
+    const examplePayload = "GET /test HTTP/1.1\r\n\r\n";
+
+    let payload = Buffer.from(examplePayload);
+    let method = httpMethod(payload);
+
+    if (method != "GET") {
+        return fail(`Path '${method}' != 'GET'`)
+    }
+}
+
+
+function TEST_httpPathParam() {
+    let p = Buffer.from("GET / HTTP/1.1\r\n\r\n");
+
+    if (httpPathParam(p, "test")) {
+        return fail("Should not found param")
+    }
+
+    p = setHttpPathParam(p, "test", "123");
+    if (httpPath(p) != "/?test=123") {
+        return fail("Should set first param: " + httpPath(p));
+    }
+
+    if (httpPathParam(p, "test") != "123") {
+        return fail("Should get first param: " + httpPathParam(p, "test"));
+    }
+
+    p = setHttpPathParam(p, "qwer", "ty");
+    if (httpPath(p) != "/?test=123&qwer=ty") {
+        return fail("Should set second param: " + httpPath(p));
+    }
+
+    p = setHttpPathParam(p, "test", "4321");
+    if (httpPath(p) != "/?test=4321&qwer=ty") {
+        return fail("Should update first param: " + httpPath(p));
+    }
+
+    if (httpPathParam(p, "test") != "4321") {
+        return fail("Should update first param: " + httpPath(p));
+    }
+}
+
+function TEST_httpBodyParam() {
+    let p = Buffer.from("POST / HTTP/1.1\r\n\r\n");
+
+    if (httpBodyParam(p, "test")) {
+        return fail("Should not found param")
+    }
+
+    p = setHttpBodyParam(p, "test", "123");
+    if (httpBody(p).toString() != "test=123") {
+        return fail("Should set first param: " + httpBody(p).toString());
+    }
+
+    if (httpBodyParam(p, "test") != "123") {
+        return fail("Should get first param: " + httpBodyParam(p, "test"));
+    }
+
+    p = setHttpBodyParam(p, "qwer", "ty");
+    if (httpBody(p).toString() != "test=123&qwer=ty") {
+        return fail("Should set second param: " + httpBody(p).toString());
+    }
+
+    p = setHttpBodyParam(p, "test", "4321");
+    if (httpBody(p).toString() != "test=4321&qwer=ty") {
+        return fail("Should update first param: " + httpBody(p).toString());
+    }
+
+    if (httpBodyParam(p, "test") != "4321") {
+        return fail("Should update first param: " + httpBody(p).toString());
+    }
+}
+
+function TEST_httpHeader() {
+    const examplePayload = "GET / HTTP/1.1\r\nHost: localhost:3000\r\nUser-Agent: Node\r\nContent-Length:5\r\n\r\nhello";
+
+    let expected = {"Host": "localhost:3000", "User-Agent": "Node", "Content-Length": "5"}
+
+    Object.keys(expected).forEach(function(name){
+        let payload = Buffer.from(examplePayload);
+        let header = httpHeader(payload, name);
+        if (!header) {
+            fail(`Header not found. Was looking for: ${name}`)
+        }
+        if (header && header.value != expected[name]) {
+            fail(`${name}: '${expected[name]}' != '${header.value}'`)
+        }
+    })
+}
+
+
+function TEST_setHttpHeader() {
+    const examplePayload = "GET / HTTP/1.1\r\nUser-Agent: Node\r\nContent-Length: 5\r\n\r\nhello";
+
+    // Modify existing header
+    ["", "1", "Long test header"].forEach(function(ua){
+        let expected = `GET / HTTP/1.1\r\nUser-Agent: ${ua}\r\nContent-Length: 5\r\n\r\nhello`;
+        let p = Buffer.from(examplePayload);
+        p = setHttpHeader(p, "User-Agent", ua);
+        if (p != expected) {
+            console.error(`setHeader failed, expected User-Agent value: ${ua}.\n${p}`)
+        }
+    })
+
+    // Adding new header
+    let expected = `GET / HTTP/1.1\r\nX-Test: test\r\nUser-Agent: Node\r\nContent-Length: 5\r\n\r\nhello`;
+    let p = Buffer.from(examplePayload);
+    p = setHttpHeader(p, "X-Test", "test");
+    if (p != expected) {
+        console.error(`setHeader failed, expected new header 'X-Test' header: ${p}`)
+    }
+}
+
+function TEST_deleteHttpHeader() {
+    const examplePayload = "GET / HTTP/1.1\r\nUser-Agent: Node\r\nContent-Length: 5\r\n\r\nhello";
+
+    // Adding new header
+    let expected = `GET / HTTP/1.1\r\nContent-Length: 5\r\n\r\nhello`;
+    let p = Buffer.from(examplePayload);
+    p = deleteHttpHeader(p, "User-Agent", "test");
+    if (p != expected) {
+        console.error(`setHeader failed, expected delete header 'User-Agent' header: ${p}`)
+    }
+}
+
+function TEST_httpBody() {
+    const examplePayload = "GET / HTTP/1.1\r\nUser-Agent: Node\r\nContent-Length: 5\r\n\r\nhello";
+    let body = httpBody(Buffer.from(examplePayload));
+    if (body != "hello") {
+        fail(`'${body}' != 'hello'`)
+    }
+}
+
+function TEST_setHttpBody() {
+    const examplePayload = "GET / HTTP/1.1\r\nUser-Agent: Node\r\nContent-Length: 5\r\n\r\nhello";
+    let p = setHttpBody(Buffer.from(examplePayload), Buffer.from("hello, world!"));
+
+    if (p != "GET / HTTP/1.1\r\nUser-Agent: Node\r\nContent-Length: 13\r\n\r\nhello, world!") {
+        fail(`Wrong body: '${p}'`)
+    }
+}
+
+function TEST_httpCookie() {
+    const examplePayload = "GET / HTTP/1.1\r\nCookie: a=b; test=zxc\r\n\r\n";
+    let c = httpCookie(Buffer.from(examplePayload), "test");
+    if (c != "zxc") {
+        return fail(`Should get cookie: ${c}`);
+    }
+
+    c = httpCookie(Buffer.from(examplePayload), "nope");
+    if (c != null) {
+        return fail(`Should not find cookie: ${c}`);
+    }
+}
+
+function TEST_setHttpCookie() {
+    const examplePayload = "GET / HTTP/1.1\r\nCookie: a=b; test=zxc\r\n\r\n";
+    let p = setHttpCookie(Buffer.from(examplePayload), "test", "1");
+    if (p != "GET / HTTP/1.1\r\nCookie: a=b; test=1\r\n\r\n") {
+        return fail(`Should update cookie: ${p}`)
+    }
+
+    p = setHttpCookie(Buffer.from(examplePayload), "new", "one");
+    if (p != "GET / HTTP/1.1\r\nCookie: a=b; test=zxc; new=one\r\n\r\n") {
+        return fail(`Should add new cookie: ${p}`)
+    }
+}
+
+function TEST_deleteHttpCookie() {
+    const examplePayload = "GET / HTTP/1.1\r\nCookie: a=b; test=zxc\r\n\r\n";
+    let p = deleteHttpCookie(Buffer.from(examplePayload), "a");
+    if (p != "GET / HTTP/1.1\r\nCookie: test=zxc\r\n\r\n") {
+        return fail(`Should delete cookie: ${p}`)
+    }
+}
+
+
+function TEST_httpHeaders() {
+    const examplePayload = "GET / HTTP/1.1\r\nHost: localhost:3000\r\nUser-Agent: Node\r\nContent-Length:5\r\n\r\nhello";
+
+    let expectedHeaders = {"Host": "localhost:3000", "User-Agent": "Node", "Content-Length": "5"}
+    let payload = Buffer.from(examplePayload);
+    let headers = httpHeaders(payload);
+
+    ["Host", "User-Agent", "Content-Length"].forEach(function(header){
+        let actual = headers[header];
+        let expected = expectedHeaders[header];
+
+        if (!actual) {
+            fail(`${header} Header was not found`);
+        }
+
+        if (actual != expected) {
+            fail(`${header} Header not Equal to Expected: ${expected} was ${actual}`);
+        }
+
+    })
+}

middleware/package.json

@@ -0,0 +1,16 @@
+{
+  "name": "goreplay_middleware",
+  "version": "1.0.0",
+  "description": "Package for writing middleware for GoReplay https://goreplay.org",
+  "main": "middleware.js",
+  "scripts": {
+    "test": "node -e \"var gor = require('./middleware.js'); gor.test(); process.exit()\"",
+    "benchmark": "node -e \"var gor = require('./middleware.js'); gor.benchmark(); process.exit()\""
+  },
+  "keywords": [
+    "middleware",
+    "goreplay"
+  ],
+  "author": "Leonid Bugaev",
+  "license": "LGPL-3.0"
+}

middleware_test.go

@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"crypto/rand"
 	"encoding/hex"
-	"github.com/buger/gor/proto"
 	"io"
 	"net/http"
 	"net/http/httptest"
@@ -12,6 +11,8 @@ import (
 	"sync"
 	"testing"
 	"time"
+
+	"github.com/buger/goreplay/proto"
 )
 
 type fakeServiceCb func(string, int, []byte)
@@ -117,7 +118,7 @@ func TestEchoMiddleware(t *testing.T) {
 
 	// Catch traffic from one service
 	fromAddr := strings.Replace(from.Listener.Addr().String(), "[::]", "127.0.0.1", -1)
-	input := NewRAWInput(fromAddr, EnginePcap, true, testRawExpire, "")
+	input := NewRAWInput(fromAddr, EnginePcap, true, testRawExpire, "", "", "", 0)
 	defer input.Close()
 
 	// And redirect to another
@@ -179,7 +180,7 @@ func TestTokenMiddleware(t *testing.T) {
 
 	fromAddr := strings.Replace(from.Listener.Addr().String(), "[::]", "127.0.0.1", -1)
 	// Catch traffic from one service
-	input := NewRAWInput(fromAddr, EnginePcap, true, testRawExpire, "")
+	input := NewRAWInput(fromAddr, EnginePcap, true, testRawExpire, "", "", "", 0)
 	defer input.Close()
 
 	// And redirect to another

mkdocs.yml

@@ -0,0 +1,2 @@
+site_name: My Docs
+theme: readthedocs

output_file.go

@@ -3,11 +3,13 @@ package main
 import (
 	"bufio"
 	"compress/gzip"
+	"errors"
 	"fmt"
 	"io"
 	"log"
 	"os"
 	"path/filepath"
+	"runtime/debug"
 	"sort"
 	"strconv"
 	"strings"
@@ -15,32 +17,40 @@ import (
 	"time"
 )
 
-var dateFileNameFuncs = map[string]func() string{
-	"%Y":  func() string { return time.Now().Format("2006") },
-	"%m":  func() string { return time.Now().Format("01") },
-	"%d":  func() string { return time.Now().Format("02") },
-	"%H":  func() string { return time.Now().Format("15") },
-	"%M":  func() string { return time.Now().Format("04") },
-	"%S":  func() string { return time.Now().Format("05") },
-	"%NS": func() string { return fmt.Sprint(time.Now().Nanosecond()) },
+var dateFileNameFuncs = map[string]func(*FileOutput) string{
+	"%Y":  func(o *FileOutput) string { return time.Now().Format("2006") },
+	"%m":  func(o *FileOutput) string { return time.Now().Format("01") },
+	"%d":  func(o *FileOutput) string { return time.Now().Format("02") },
+	"%H":  func(o *FileOutput) string { return time.Now().Format("15") },
+	"%M":  func(o *FileOutput) string { return time.Now().Format("04") },
+	"%S":  func(o *FileOutput) string { return time.Now().Format("05") },
+	"%NS": func(o *FileOutput) string { return fmt.Sprint(time.Now().Nanosecond()) },
+	"%r":  func(o *FileOutput) string { return string(o.currentID) },
+	"%t":  func(o *FileOutput) string { return string(o.payloadType) },
 }
 
 type FileOutputConfig struct {
-	flushInterval time.Duration
-	sizeLimit     unitSizeVar
-	queueLimit    int
-	append        bool
+	flushInterval     time.Duration
+	sizeLimit         unitSizeVar
+	outputFileMaxSize unitSizeVar
+	queueLimit        int
+	append            bool
 }
 
 // FileOutput output plugin
 type FileOutput struct {
-	mu           sync.Mutex
-	pathTemplate string
-	currentName  string
-	file         *os.File
-	queueLength  int
-	chunkSize    int
-	writer       io.Writer
+	mu             sync.Mutex
+	pathTemplate   string
+	currentName    string
+	file           *os.File
+	queueLength    int
+	chunkSize      int
+	writer         io.Writer
+	requestPerFile bool
+	currentID      []byte
+	payloadType    []byte
+	closed         bool
+	totalFileSize  int64
 
 	config *FileOutputConfig
 }
@@ -52,18 +62,18 @@ func NewFileOutput(pathTemplate string, config *FileOutputConfig) *FileOutput {
 	o.config = config
 	o.updateName()
 
-	// Force flushing every minute
-	go func() {
-		for {
-			time.Sleep(o.config.flushInterval)
-			o.flush()
-		}
-	}()
+	if strings.Contains(pathTemplate, "%r") {
+		o.requestPerFile = true
+	}
 
 	go func() {
 		for {
-			time.Sleep(time.Second)
+			time.Sleep(config.flushInterval)
+			if o.closed {
+				break
+			}
 			o.updateName()
+			o.flush()
 		}
 	}()
 
@@ -130,7 +140,7 @@ func (o *FileOutput) filename() string {
 	path := o.pathTemplate
 
 	for name, fn := range dateFileNameFuncs {
-		path = strings.Replace(path, name, fn(), -1)
+		path = strings.Replace(path, name, fn(o), -1)
 	}
 
 	if !o.config.append {
@@ -174,10 +184,14 @@ func (o *FileOutput) updateName() {
 }
 
 func (o *FileOutput) Write(data []byte) (n int, err error) {
-	if !isOriginPayload(data) {
-		return len(data), nil
+	if o.requestPerFile {
+		meta := payloadMeta(data)
+		o.currentID = meta[1]
+		o.payloadType = meta[0]
 	}
 
+	o.updateName()
+
 	if o.file == nil || o.currentName != o.file.Name() {
 		o.mu.Lock()
 		o.Close()
@@ -202,12 +216,24 @@ func (o *FileOutput) Write(data []byte) (n int, err error) {
 	o.writer.Write(data)
 	o.writer.Write([]byte(payloadSeparator))
 
+	o.totalFileSize += int64(len(data) + len(payloadSeparator))
 	o.queueLength++
 
+	if Settings.outputFileConfig.outputFileMaxSize > 0 && o.totalFileSize >= int64(Settings.outputFileConfig.outputFileMaxSize) {
+		return len(data), errors.New("File output reached size limit")
+	}
+
 	return len(data), nil
 }
 
 func (o *FileOutput) flush() {
+	// Don't exit on panic
+	defer func() {
+		if r := recover(); r != nil {
+			log.Println("PANIC while file flush: ", r, o, string(debug.Stack()))
+		}
+	}()
+
 	defer o.mu.Unlock()
 	o.mu.Lock()
 
@@ -218,8 +244,10 @@ func (o *FileOutput) flush() {
 			o.writer.(*bufio.Writer).Flush()
 		}
 
-		if stat, err := o.file.Stat(); err != nil {
+		if stat, err := o.file.Stat(); err == nil {
 			o.chunkSize = int(stat.Size())
+		} else {
+			log.Println("Error accessing file sats", err)
 		}
 	}
 }
@@ -237,5 +265,7 @@ func (o *FileOutput) Close() error {
 		}
 		o.file.Close()
 	}
+
+	o.closed = true
 	return nil
 }

output_file_settings.go

@@ -20,11 +20,12 @@ func parseDataUnit(s string) int64 {
 	if unit, ok := dataUnitMap[s[len(s)-1]]; ok {
 		size, _ := strconv.ParseInt(s[:len(s)-1], 10, 64)
 		return unit * size
-	} else {
-		// If no unit specified use bytes
-		size, _ := strconv.ParseInt(s, 10, 64)
-		return size
 	}
+
+	// If no unit specified use bytes
+	size, _ := strconv.ParseInt(s, 10, 64)
+	return size
+
 }
 
 type unitSizeVar int64
@@ -33,7 +34,7 @@ func (u unitSizeVar) String() string {
 	return strconv.Itoa(int(u))
 }
 
-func (u unitSizeVar) Set(s string) error {
-	u = unitSizeVar(parseDataUnit(s))
+func (u *unitSizeVar) Set(s string) error {
+	*u = unitSizeVar(parseDataUnit(s))
 	return nil
 }

output_file_test.go

@@ -65,9 +65,10 @@ func TestFileOutputWithNameCleaning(t *testing.T) {
 }
 
 func TestFileOutputPathTemplate(t *testing.T) {
-	output := &FileOutput{pathTemplate: "/tmp/log-%Y-%m-%d-%S", config: &FileOutputConfig{flushInterval: time.Minute, append: true}}
+	output := &FileOutput{pathTemplate: "/tmp/log-%Y-%m-%d-%S-%t", config: &FileOutputConfig{flushInterval: time.Minute, append: true}}
 	now := time.Now()
-	expectedPath := fmt.Sprintf("/tmp/log-%s-%s-%s-%s", now.Format("2006"), now.Format("01"), now.Format("02"), now.Format("05"))
+	output.payloadType = []byte("3")
+	expectedPath := fmt.Sprintf("/tmp/log-%s-%s-%s-%s-3", now.Format("2006"), now.Format("01"), now.Format("02"), now.Format("05"))
 	path := output.filename()
 
 	if expectedPath != path {
@@ -106,6 +107,34 @@ func TestFileOutputMultipleFiles(t *testing.T) {
 	os.Remove(name3)
 }
 
+func TestFileOutputFilePerRequest(t *testing.T) {
+	output := NewFileOutput("/tmp/log-%Y-%m-%d-%S-%r", &FileOutputConfig{append: true})
+
+	if output.file != nil {
+		t.Error("Should not initialize file if no writes")
+	}
+
+	output.Write([]byte("1 1 1\ntest"))
+	name1 := output.file.Name()
+
+	output.Write([]byte("1 2 1\ntest"))
+	name2 := output.file.Name()
+
+	time.Sleep(time.Second)
+	output.updateName()
+
+	output.Write([]byte("1 3 1\ntest"))
+	name3 := output.file.Name()
+
+	if name3 == name2 || name2 == name1 || name3 == name1 {
+		t.Error("File name should change:", name1, name2, name3)
+	}
+
+	os.Remove(name1)
+	os.Remove(name2)
+	os.Remove(name3)
+}
+
 func TestFileOutputCompression(t *testing.T) {
 	output := NewFileOutput("/tmp/log-%Y-%m-%d-%S.gz", &FileOutputConfig{append: true, flushInterval: time.Minute})
 
@@ -283,3 +312,37 @@ func TestFileOutputSort(t *testing.T) {
 		t.Error("Should properly sort file names using indexes", files, expected)
 	}
 }
+
+func TestFileOutputAppendSizeLimitOverflow(t *testing.T) {
+	rnd := rand.Int63()
+	name := fmt.Sprintf("/tmp/%d", rnd)
+
+	message := []byte("1 1 1\r\ntest")
+
+	messageSize := len(message) + len(payloadSeparator)
+
+	output := NewFileOutput(name, &FileOutputConfig{append: false, flushInterval: time.Minute, sizeLimit: unitSizeVar(2 * messageSize)})
+
+	output.Write([]byte("1 1 1\r\ntest"))
+	name1 := output.file.Name()
+
+	output.Write([]byte("1 1 1\r\ntest"))
+	name2 := output.file.Name()
+
+	output.flush()
+	output.updateName()
+
+	output.Write([]byte("1 1 1\r\ntest"))
+	name3 := output.file.Name()
+
+	if name2 != name1 || name1 != fmt.Sprintf("/tmp/%d_0", rnd) {
+		t.Error("Fast changes should happen in same file:", name1, name2, name3)
+	}
+
+	if name3 == name1 || name3 != fmt.Sprintf("/tmp/%d_1", rnd) {
+		t.Error("File name should change:", name1, name2, name3)
+	}
+
+	os.Remove(name1)
+	os.Remove(name3)
+}

output_http.go

@@ -2,10 +2,11 @@ package main
 
 import (
 	"io"
+	"log"
 	"sync/atomic"
 	"time"
 
-	"github.com/buger/gor/proto"
+	"github.com/buger/goreplay/proto"
 )
 
 const initialDynamicWorkers = 10
@@ -14,14 +15,19 @@ type response struct {
 	payload       []byte
 	uuid          []byte
 	roundTripTime int64
+	startedAt     int64
 }
 
 // HTTPOutputConfig struct for holding http output configuration
 type HTTPOutputConfig struct {
 	redirectLimit int
 
-	stats   bool
-	workers int
+	stats      bool
+	workersMin int
+	workersMax int
+	statsMs    int
+	workers    int
+	queueLen   int
 
 	elasticSearch string
 
@@ -29,6 +35,8 @@ type HTTPOutputConfig struct {
 	OriginalHost bool
 	BufferSize   int
 
+	CompatibilityMode bool
+
 	Debug bool
 
 	TrackResponses bool
@@ -67,18 +75,18 @@ func NewHTTPOutput(address string, config *HTTPOutputConfig) io.Writer {
 	o.config = config
 
 	if o.config.stats {
-		o.queueStats = NewGorStat("output_http")
+		o.queueStats = NewGorStat("output_http", o.config.statsMs)
 	}
 
-	o.queue = make(chan []byte, 1000)
-	o.responses = make(chan response, 1000)
+	o.queue = make(chan []byte, o.config.queueLen)
+	o.responses = make(chan response, o.config.queueLen)
 	o.needWorker = make(chan int, 1)
 
 	// Initial workers count
-	if o.config.workers == 0 {
+	if o.config.workersMax == 0 {
 		o.needWorker <- initialDynamicWorkers
 	} else {
-		o.needWorker <- o.config.workers
+		o.needWorker <- o.config.workersMax
 	}
 
 	if o.config.elasticSearch != "" {
@@ -86,10 +94,6 @@ func NewHTTPOutput(address string, config *HTTPOutputConfig) io.Writer {
 		o.elasticSearch.Init(o.config.elasticSearch)
 	}
 
-	if len(Settings.middleware) > 0 {
-		o.config.TrackResponses = true
-	}
-
 	go o.workerMaster()
 
 	return o
@@ -101,11 +105,6 @@ func (o *HTTPOutput) workerMaster() {
 		for i := 0; i < newWorkers; i++ {
 			go o.startWorker()
 		}
-
-		// Disable dynamic scaling if workers poll fixed size
-		if o.config.workers != 0 {
-			return
-		}
 	}
 }
 
@@ -116,6 +115,7 @@ func (o *HTTPOutput) startWorker() {
 		OriginalHost:       o.config.OriginalHost,
 		Timeout:            o.config.Timeout,
 		ResponseBufferSize: o.config.BufferSize,
+		CompatibilityMode:  o.config.CompatibilityMode,
 	})
 
 	deathCount := 0
@@ -129,17 +129,16 @@ func (o *HTTPOutput) startWorker() {
 			deathCount = 0
 		case <-time.After(time.Millisecond * 100):
 			// When dynamic scaling enabled workers die after 2s of inactivity
-			if o.config.workers == 0 {
-				deathCount++
-			} else {
+			if o.config.workersMin == o.config.workersMax {
 				continue
 			}
 
+			deathCount++
 			if deathCount > 20 {
-				workersCount := atomic.LoadInt64(&o.activeWorkers)
+				workersCount := int(atomic.LoadInt64(&o.activeWorkers))
 
 				// At least 1 startWorker should be alive
-				if workersCount != 1 {
+				if workersCount != 1 && workersCount > o.config.workersMin {
 					atomic.AddInt64(&o.activeWorkers, -1)
 					return
 				}
@@ -162,11 +161,18 @@ func (o *HTTPOutput) Write(data []byte) (n int, err error) {
 		o.queueStats.Write(len(o.queue))
 	}
 
-	if o.config.workers == 0 {
-		workersCount := atomic.LoadInt64(&o.activeWorkers)
+	if o.config.workersMax != o.config.workersMin {
+		workersCount := int(atomic.LoadInt64(&o.activeWorkers))
 
-		if len(o.queue) > int(workersCount) {
-			o.needWorker <- len(o.queue)
+		if len(o.queue) > workersCount {
+			extraWorkersReq := len(o.queue) - workersCount + 1
+			maxWorkersAvailable := o.config.workersMax - workersCount
+			if extraWorkersReq > maxWorkersAvailable {
+				extraWorkersReq = maxWorkersAvailable
+			}
+			if extraWorkersReq > 0 {
+				o.needWorker <- extraWorkersReq
+			}
 		}
 	}
 
@@ -176,9 +182,11 @@ func (o *HTTPOutput) Write(data []byte) (n int, err error) {
 func (o *HTTPOutput) Read(data []byte) (int, error) {
 	resp := <-o.responses
 
-	Debug("[OUTPUT-HTTP] Received response:", string(resp.payload))
+	if Settings.debug {
+		Debug("[OUTPUT-HTTP] Received response:", string(resp.payload))
+	}
 
-	header := payloadHeader(ReplayedResponsePayload, resp.uuid, resp.roundTripTime)
+	header := payloadHeader(ReplayedResponsePayload, resp.uuid, resp.roundTripTime, resp.startedAt)
 	copy(data[0:len(header)], header)
 	copy(data[len(header):], resp.payload)
 
@@ -187,6 +195,11 @@ func (o *HTTPOutput) Read(data []byte) (int, error) {
 
 func (o *HTTPOutput) sendRequest(client *HTTPClient, request []byte) {
 	meta := payloadMeta(request)
+
+	if Settings.debug {
+		Debug(meta)
+	}
+
 	if len(meta) < 2 {
 		return
 	}
@@ -202,11 +215,12 @@ func (o *HTTPOutput) sendRequest(client *HTTPClient, request []byte) {
 	stop := time.Now()
 
 	if err != nil {
+		log.Println("Error when sending ", err, time.Now())
 		Debug("Request error:", err)
 	}
 
 	if o.config.TrackResponses {
-		o.responses <- response{resp, uuid, stop.UnixNano() - start.UnixNano()}
+		o.responses <- response{resp, uuid, start.UnixNano(), stop.UnixNano() - start.UnixNano()}
 	}
 
 	if o.elasticSearch != nil {

output_http_test.go

@@ -43,15 +43,19 @@ func TestHTTPOutput(t *testing.T) {
 	methods := HTTPMethods{[]byte("GET"), []byte("PUT"), []byte("POST")}
 	Settings.modifierConfig = HTTPModifierConfig{headers: headers, methods: methods}
 
-	output := NewHTTPOutput(server.URL, &HTTPOutputConfig{Debug: true})
+	http_output := NewHTTPOutput(server.URL, &HTTPOutputConfig{Debug: true, TrackResponses: true})
+	output := NewTestOutput(func(data []byte) {
+		wg.Done()
+	})
 
 	Plugins.Inputs = []io.Reader{input}
-	Plugins.Outputs = []io.Writer{output}
+	Plugins.Outputs = []io.Writer{http_output, output}
 
 	go Start(quit)
 
-	for i := 0; i < 100; i++ {
-		wg.Add(2) // OPTIONS should be ignored
+	for i := 0; i < 1; i++ {
+		// 2 http-output, 2 - test output request, 2 - test output http response
+		wg.Add(6) // OPTIONS should be ignored
 		input.EmitPOST()
 		input.EmitOPTIONS()
 		input.EmitGET()

output_kafka.go

@@ -0,0 +1,101 @@
+package main
+
+import (
+	"encoding/json"
+	"io"
+	"log"
+	"strings"
+	"time"
+
+	"github.com/buger/goreplay/proto"
+
+	"github.com/Shopify/sarama"
+	"github.com/Shopify/sarama/mocks"
+)
+
+// KafkaOutput is used for sending payloads to kafka in JSON format.
+type KafkaOutput struct {
+	config   *KafkaConfig
+	producer sarama.AsyncProducer
+}
+
+// KafkaOutputFrequency in milliseconds
+const KafkaOutputFrequency = 500
+
+// NewKafkaOutput creates instance of kafka producer client.
+func NewKafkaOutput(address string, config *KafkaConfig) io.Writer {
+	c := sarama.NewConfig()
+
+	var producer sarama.AsyncProducer
+
+	if mock, ok := config.producer.(*mocks.AsyncProducer); ok && mock != nil {
+		producer = config.producer
+	} else {
+		c.Producer.RequiredAcks = sarama.WaitForLocal
+		c.Producer.Compression = sarama.CompressionSnappy
+		c.Producer.Flush.Frequency = KafkaOutputFrequency * time.Millisecond
+
+		brokerList := strings.Split(config.host, ",")
+
+		var err error
+		producer, err = sarama.NewAsyncProducer(brokerList, c)
+		if err != nil {
+			log.Fatalln("Failed to start Sarama(Kafka) producer:", err)
+		}
+	}
+
+	o := &KafkaOutput{
+		config:   config,
+		producer: producer,
+	}
+
+	if Settings.verbose {
+		// Start infinite loop for tracking errors for kafka producer.
+		go o.ErrorHandler()
+	}
+
+	return o
+}
+
+// ErrorHandler should receive errors
+func (o *KafkaOutput) ErrorHandler() {
+	for err := range o.producer.Errors() {
+		log.Println("Failed to write access log entry:", err)
+	}
+}
+
+func (o *KafkaOutput) Write(data []byte) (n int, err error) {
+	var message sarama.StringEncoder
+
+	if !o.config.useJSON {
+		message = sarama.StringEncoder(data)
+	} else {
+		headers := make(map[string]string)
+		proto.ParseHeaders([][]byte{data}, func(header []byte, value []byte) bool {
+			headers[string(header)] = string(value)
+			return true
+		})
+
+		meta := payloadMeta(data)
+		req := payloadBody(data)
+
+		kafkaMessage := KafkaMessage{
+			ReqURL:     string(proto.Path(req)),
+			ReqType:    string(meta[0]),
+			ReqID:      string(meta[1]),
+			ReqTs:      string(meta[2]),
+			ReqMethod:  string(proto.Method(req)),
+			ReqBody:    string(proto.Body(req)),
+			ReqHeaders: headers,
+		}
+		jsonMessage, _ := json.Marshal(&kafkaMessage)
+		message = sarama.StringEncoder(jsonMessage)
+	}
+
+	o.producer.Input() <- &sarama.ProducerMessage{
+		Topic: o.config.topic,
+		Value: message,
+	}
+
+	return len(message), nil
+}

output_kafka_test.go

@@ -0,0 +1,54 @@
+package main
+
+import (
+	"testing"
+
+	"github.com/Shopify/sarama"
+	"github.com/Shopify/sarama/mocks"
+)
+
+func TestOutputKafkaRAW(t *testing.T) {
+	config := sarama.NewConfig()
+	config.Producer.Return.Successes = true
+	producer := mocks.NewAsyncProducer(t, config)
+	producer.ExpectInputAndSucceed()
+
+	output := NewKafkaOutput("", &KafkaConfig{
+		producer: producer,
+		topic:    "test",
+		useJSON:  false,
+	})
+
+	output.Write([]byte("1 2 3\nGET / HTTP1.1\r\nHeader: 1\r\n\r\n"))
+
+	resp := <-producer.Successes()
+
+	data, _ := resp.Value.Encode()
+
+	if string(data) != "1 2 3\nGET / HTTP1.1\r\nHeader: 1\r\n\r\n" {
+		t.Error("Message not properly encoded: ", string(data))
+	}
+}
+
+func TestOutputKafkaJSON(t *testing.T) {
+	config := sarama.NewConfig()
+	config.Producer.Return.Successes = true
+	producer := mocks.NewAsyncProducer(t, config)
+	producer.ExpectInputAndSucceed()
+
+	output := NewKafkaOutput("", &KafkaConfig{
+		producer: producer,
+		topic:    "test",
+		useJSON:  true,
+	})
+
+	output.Write([]byte("1 2 3\nGET / HTTP1.1\r\nHeader: 1\r\n\r\n"))
+
+	resp := <-producer.Successes()
+
+	data, _ := resp.Value.Encode()
+
+	if string(data) != `{"Req_URL":"/","Req_Type":"1","Req_ID":"2","Req_Ts":"3","Req_Method":"GET","Req_Headers":{"Header":"1"}}` {
+		t.Error("Message not properly encoded: ", string(data))
+	}
+}

output_null.go

@@ -0,0 +1,18 @@
+package main
+
+// NullOutput used for debugging, prints nothing
+type NullOutput struct {
+}
+
+// NullOutput constructor for NullOutput
+func NewNullOutput() (o *NullOutput) {
+	return new(NullOutput)
+}
+
+func (o *NullOutput) Write(data []byte) (int, error) {
+	return len(data), nil
+}
+
+func (o *NullOutput) String() string {
+	return "Null Output"
+}

output_tcp.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"crypto/tls"
 	"fmt"
 	"io"
 	"log"
@@ -16,18 +17,24 @@ type TCPOutput struct {
 	limit    int
 	buf      chan []byte
 	bufStats *GorStat
+	config   *TCPOutputConfig
+}
+
+type TCPOutputConfig struct {
+	secure bool
 }
 
 // NewTCPOutput constructor for TCPOutput
 // Initialize 10 workers which hold keep-alive connection
-func NewTCPOutput(address string) io.Writer {
+func NewTCPOutput(address string, config *TCPOutputConfig) io.Writer {
 	o := new(TCPOutput)
 
 	o.address = address
+	o.config = config
 
-	o.buf = make(chan []byte, 100)
+	o.buf = make(chan []byte, 1000)
 	if Settings.outputTCPStats {
-		o.bufStats = NewGorStat("output_tcp")
+		o.bufStats = NewGorStat("output_tcp", 5000)
 	}
 
 	for i := 0; i < 10; i++ {
@@ -59,11 +66,13 @@ func (o *TCPOutput) worker() {
 	defer conn.Close()
 
 	for {
-		conn.Write(<-o.buf)
+		data := <-o.buf
+		conn.Write(data)
 		_, err := conn.Write([]byte(payloadSeparator))
 
 		if err != nil {
-			log.Println("Lost connection with aggregator instance, reconnecting")
+			log.Println("INFO: TCP output connection closed, reconnecting")
+			o.buf <- data
 			go o.worker()
 			break
 		}
@@ -89,7 +98,11 @@ func (o *TCPOutput) Write(data []byte) (n int, err error) {
 }
 
 func (o *TCPOutput) connect(address string) (conn net.Conn, err error) {
-	conn, err = net.Dial("tcp", address)
+	if o.config.secure {
+		conn, err = tls.Dial("tcp", address, &tls.Config{})
+	} else {
+		conn, err = net.Dial("tcp", address)
+	}
 
 	return
 }

output_tcp_test.go

@@ -17,7 +17,7 @@ func TestTCPOutput(t *testing.T) {
 		wg.Done()
 	})
 	input := NewTestInput()
-	output := NewTCPOutput(listener.Addr().String())
+	output := NewTCPOutput(listener.Addr().String(), &TCPOutputConfig{})
 
 	Plugins.Inputs = []io.Reader{input}
 	Plugins.Outputs = []io.Writer{output}
@@ -69,7 +69,7 @@ func BenchmarkTCPOutput(b *testing.B) {
 		wg.Done()
 	})
 	input := NewTestInput()
-	output := NewTCPOutput(listener.Addr().String())
+	output := NewTCPOutput(listener.Addr().String(), &TCPOutputConfig{})
 
 	Plugins.Inputs = []io.Reader{input}
 	Plugins.Outputs = []io.Writer{output}

plugins.go

@@ -5,7 +5,6 @@ import (
 	"reflect"
 	"strings"
 	"sync"
-	"time"
 )
 
 // InOutPlugins struct for holding references to plugins
@@ -95,21 +94,27 @@ func InitPlugins() {
 		registerPlugin(NewDummyOutput)
 	}
 
+	if Settings.outputNull {
+		registerPlugin(NewNullOutput)
+	}
+
 	engine := EnginePcap
 	if Settings.inputRAWEngine == "raw_socket" {
 		engine = EngineRawSocket
+	} else if Settings.inputRAWEngine == "pcap_file" {
+		engine = EnginePcapFile
 	}
 
 	for _, options := range Settings.inputRAW {
-		registerPlugin(NewRAWInput, options, engine, Settings.inputRAWTrackResponse, time.Duration(0), Settings.inputRAWRealIPHeader)
+		registerPlugin(NewRAWInput, options, engine, Settings.inputRAWTrackResponse, Settings.inputRAWExpire, Settings.inputRAWRealIPHeader, Settings.inputRAWBpfFilter, Settings.inputRAWTimestampType, Settings.inputRawBufferSize)
 	}
 
 	for _, options := range Settings.inputTCP {
-		registerPlugin(NewTCPInput, options)
+		registerPlugin(NewTCPInput, options, &Settings.inputTCPConfig)
 	}
 
 	for _, options := range Settings.outputTCP {
-		registerPlugin(NewTCPOutput, options)
+		registerPlugin(NewTCPOutput, options, &Settings.outputTCPConfig)
 	}
 
 	for _, options := range Settings.inputFile {
@@ -136,4 +141,12 @@ func InitPlugins() {
 	for _, options := range Settings.outputHTTP {
 		registerPlugin(NewHTTPOutput, options, &Settings.outputHTTPConfig)
 	}
+
+	if Settings.outputKafkaConfig.host != "" && Settings.outputKafkaConfig.topic != "" {
+		registerPlugin(NewKafkaOutput, "", &Settings.outputKafkaConfig)
+	}
+
+	if Settings.inputKafkaConfig.host != "" && Settings.inputKafkaConfig.topic != "" {
+		registerPlugin(NewKafkaInput, "", &Settings.inputKafkaConfig)
+	}
 }

proto/fuzz.go

@@ -0,0 +1,12 @@
+// +build gofuzz
+
+package proto
+
+func Fuzz(data []byte) int {
+
+	ParseHeaders([][]byte{data}, func(header []byte, value []byte) bool {
+		return true
+	})
+
+	return 1
+}

proto/proto.go

@@ -18,7 +18,8 @@ package proto
 
 import (
 	"bytes"
-	"github.com/buger/gor/byteutils"
+
+	"github.com/buger/goreplay/byteutils"
 )
 
 // In HTTP newline defined by 2 bytes (for both windows and *nix support)
@@ -32,7 +33,7 @@ var HeaderDelim = []byte(": ")
 
 // MIMEHeadersEndPos finds end of the Headers section, which should end with empty line.
 func MIMEHeadersEndPos(payload []byte) int {
-	return bytes.Index(payload, EmptyLine)
+	return bytes.Index(payload, EmptyLine) + 4
 }
 
 // MIMEHeadersStartPos finds start of Headers section
@@ -41,82 +42,23 @@ func MIMEHeadersStartPos(payload []byte) int {
 	return bytes.Index(payload, CLRF) + 2 // Find first line end
 }
 
-func isLower(b byte) bool {
-	if 'a' <= b && b <= 'z' {
-		return true
-	}
-
-	return false
-}
-
-func toUpper(b byte) byte {
-	if 'a' <= b && b <= 'z' {
-		b -= 'a' - 'A'
-	}
-	return b
-}
-
-func toLower(b byte) byte {
-	if 'A' <= b && b <= 'Z' {
-		b += 'a' - 'A'
-	}
-	return b
-}
-
 func headerIndex(payload []byte, name []byte) int {
-	isLower := isLower(name[0])
 	i := 0
-
 	for {
-		if i >= len(payload) {
+		// we need enough space for at least '\n' and the header name
+		if i >= (len(payload) - len(name) - 1) {
 			return -1
 		}
 
 		if payload[i] == '\n' {
 			i++
-
-			// We are at the end
-			if i == len(payload) {
-				return -1
-			}
-
-			if payload[i] == name[0] ||
-				(!isLower && payload[i] == toLower(name[0])) ||
-				(isLower && payload[i] == toUpper(name[0])) {
-
-				i++
-				j := 1
-				for {
-					if j == len(name) {
-						// Matched, and return start of the header
-						return i - len(name)
-					}
-
-					if payload[i] != name[j] {
-						break
-					}
-
-					// If compound header name do one more case check: Content-Length or Transfer-Encoding
-					if name[j] == '-' {
-						i++
-						j++
-
-						if !(payload[i] == name[j] ||
-							(!isLower && payload[i] == toLower(name[j])) ||
-							(isLower && payload[i] == toUpper(name[j]))) {
-							break
-						}
-					}
-
-					j++
-					i++
-				}
+			if bytes.EqualFold(name, payload[i:i+len(name)]) {
+				return i
 			}
 		}
-
 		i++
-	}
 
+	}
 	return -1
 }
 
@@ -133,7 +75,7 @@ func header(payload []byte, name []byte) (value []byte, headerStart, headerEnd,
 	valueStart = headerStart + len(name) + 1 // Skip ":" after header name
 	headerEnd = valueStart + bytes.IndexByte(payload[valueStart:], '\n')
 
-	for valueStart < headerEnd {          // Ignore empty space after ':'
+	for valueStart < headerEnd { // Ignore empty space after ':'
 		if payload[valueStart] == ' ' {
 			valueStart++
 		} else {
@@ -148,7 +90,7 @@ func header(payload []byte, name []byte) (value []byte, headerStart, headerEnd,
 	}
 
 	// ignore empty space at end of header value
-	for valueStart < valueEnd  {
+	for valueStart < valueEnd {
 		if payload[valueEnd-1] == ' ' {
 			valueEnd--
 		} else {
@@ -160,6 +102,133 @@ func header(payload []byte, name []byte) (value []byte, headerStart, headerEnd,
 	return
 }
 
+// Works only with ASCII
+func HeadersEqual(h1 []byte, h2 []byte) bool {
+	if len(h1) != len(h2) {
+		return false
+	}
+
+	for i, c1 := range h1 {
+		c2 := h2[i]
+
+		switch int(c1) - int(c2) {
+		case 0, 32, -32:
+		default:
+			return false
+		}
+	}
+
+	return true
+}
+
+// Parsing headers from multiple payloads
+func ParseHeaders(payloads [][]byte, cb func(header []byte, value []byte) bool) {
+	hS := [2]int{0, 0}   // header start
+	hE := [2]int{-1, -1} // header end
+	vS := [2]int{-1, -1} // value start
+	vE := [2]int{-1, -1} // value end
+
+	i := 0
+	pIdx := 0
+	lineBreaks := 0
+	newLineBreak := true
+
+	for {
+		if len(payloads)-1 < pIdx {
+			break
+		}
+
+		p := payloads[pIdx]
+
+		if len(p)-1 < i {
+			pIdx++
+			i = 0
+			continue
+		}
+
+		switch p[i] {
+		case '\r', '\n':
+			newLineBreak = true
+			lineBreaks++
+
+			// End of headers
+			if lineBreaks == 4 {
+				return
+			}
+
+			if lineBreaks > 1 {
+				break
+			}
+
+			vE = [2]int{pIdx, i}
+
+			if vS[1] != -1 && vE[1] != -1 &&
+				hS[1] != -1 && hE[1] != -1 {
+
+				var header, value []byte
+
+				phS, phE, pvS, pvE := payloads[hS[0]], payloads[hE[0]], payloads[vS[0]], payloads[vE[0]]
+
+				// If in same payload
+				if hS[0] == hE[0] {
+					header = phS[hS[1]:hE[1]]
+				} else {
+					header = make([]byte, len(phS)-hS[1]+hE[1])
+					copy(header, phS[hS[1]:])
+					copy(header[len(phS)-hS[1]:], phE[:hE[1]])
+				}
+
+				if vS[0] == vE[0] {
+					value = pvS[vS[1]:vE[1]]
+				} else {
+					value = make([]byte, len(pvS)-vS[1]+vE[1])
+					copy(value, pvS[vS[1]:])
+					copy(value[len(pvS)-vS[1]:], pvE[:vE[1]])
+				}
+
+				if !cb(header, value) {
+					return
+				}
+			}
+
+			// Header found, reset values
+			vS = [2]int{-1, -1}
+			vE = [2]int{-1, -1}
+			hS = [2]int{-1, -1}
+			hE = [2]int{-1, -1}
+		case ':':
+			if newLineBreak {
+				hE = [2]int{pIdx, i}
+				newLineBreak = false
+			}
+			lineBreaks = 0
+		default:
+			lineBreaks = 0
+
+			if hS[1] == -1 {
+				hS = [2]int{pIdx, i}
+				hE = [2]int{-1, -1}
+			} else {
+				if hE[1] == -1 {
+					break
+				}
+
+				if vS[1] == -1 {
+					if p[i] == ' ' {
+						break
+					}
+
+					vS = [2]int{pIdx, i}
+				}
+			}
+		}
+
+		i++
+	}
+
+	return
+}
+
 // Header returns header value, if header not found, value will be blank
 func Header(payload, name []byte) []byte {
 	val, _, _, _, _ := header(payload, name)
@@ -170,7 +239,7 @@ func Header(payload, name []byte) []byte {
 // SetHeader sets header value. If header not found it creates new one.
 // Returns modified request payload
 func SetHeader(payload, name, value []byte) []byte {
-	_, hs, _, vs, ve  := header(payload, name)
+	_, hs, _, vs, ve := header(payload, name)
 
 	if hs != -1 {
 		// If header found we just replace its value
@@ -196,12 +265,12 @@ func AddHeader(payload, name, value []byte) []byte {
 
 // DelHeader takes http payload and removes header name from headers section
 // Returns modified request payload
-func DeleteHeader(payload, name[]byte) []byte {
+func DeleteHeader(payload, name []byte) []byte {
 	_, hs, he, _, _ := header(payload, name)
 	if hs != -1 {
-		newHeader := make([]byte, len(payload) - (he - hs) - 1)
+		newHeader := make([]byte, len(payload)-(he-hs)-1)
 		copy(newHeader[:hs], payload[:hs])
-		copy(newHeader[hs:], payload[he + 1:])
+		copy(newHeader[hs:], payload[he+1:])
 		return newHeader
 	}
 	return payload
@@ -210,14 +279,35 @@ func DeleteHeader(payload, name[]byte) []byte {
 // Body returns request/response body
 func Body(payload []byte) []byte {
 	// 4 -> len(EMPTY_LINE)
-	return payload[MIMEHeadersEndPos(payload)+4:]
+	if len(payload) < 4 {
+		return []byte{}
+	}
+
+	return payload[MIMEHeadersEndPos(payload):]
 }
 
 // Path takes payload and retuns request path: Split(firstLine, ' ')[1]
 func Path(payload []byte) []byte {
 	start := bytes.IndexByte(payload, ' ') + 1
+	eol := bytes.IndexByte(payload[start:], '\r')
 	end := bytes.IndexByte(payload[start:], ' ')
 
+	if eol > 0 {
+		if end == -1 || eol < end {
+			return payload[start : start+eol]
+		}
+	} else { // support for legacy clients
+		eol = bytes.IndexByte(payload[start:], '\n')
+
+		if eol > 0 && (end == -1 || eol < end) {
+			return payload[start : start+eol]
+		}
+	}
+
+	if end < 0 {
+		return payload[start:len(payload)]
+	}
+
 	return payload[start : start+end]
 }
 
@@ -322,7 +412,7 @@ func Status(payload []byte) []byte {
 }
 
 var httpMethods []string = []string{
-	"GET ", "OPTI", "HEAD", "POST", "PUT ", "DELE", "TRAC", "CONN", /* custom methods */"BAN", "PURG",
+	"GET ", "OPTI", "HEAD", "POST", "PUT ", "DELE", "TRAC", "CONN", "PATC" /* custom methods */, "BAN ", "PURG", "PROP", "MKCO", "COPY", "MOVE", "LOCK", "UNLO",
 }
 
 func IsHTTPPayload(payload []byte) bool {

proto/proto_test.go

@@ -2,6 +2,7 @@ package proto
 
 import (
 	"bytes"
+	"reflect"
 	"testing"
 )
 
@@ -64,13 +65,13 @@ func TestHeader(t *testing.T) {
 }
 
 func TestMIMEHeadersEndPos(t *testing.T) {
-	head := []byte("POST /post HTTP/1.1\r\nContent-Length: 7\r\nHost: www.w3.org")
+	head := []byte("POST /post HTTP/1.1\r\nContent-Length: 7\r\nHost: www.w3.org\r\n\r\n")
 	payload := []byte("POST /post HTTP/1.1\r\nContent-Length: 7\r\nHost: www.w3.org\r\n\r\na=1&b=2")
 
 	end := MIMEHeadersEndPos(payload)
 
 	if !bytes.Equal(payload[:end], head) {
-		t.Error("Wrong headers end position:", end)
+		t.Error("Wrong headers end position:", end, head, payload[:end])
 	}
 }
 
@@ -79,10 +80,10 @@ func TestMIMEHeadersStartPos(t *testing.T) {
 	payload := []byte("POST /post HTTP/1.1\r\nContent-Length: 7\r\nHost: www.w3.org\r\n\r\na=1&b=2")
 
 	start := MIMEHeadersStartPos(payload)
-	end := MIMEHeadersEndPos(payload)
+	end := MIMEHeadersEndPos(payload) - 4
 
 	if !bytes.Equal(payload[start:end], headers) {
-		t.Error("Wrong headers end position:", start, end)
+		t.Error("Wrong headers end position:", start, end, payload[start:end])
 	}
 }
 
@@ -123,6 +124,111 @@ func TestDeleteHeader(t *testing.T) {
 	}
 }
 
+func TestParseHeaders(t *testing.T) {
+	payload := [][]byte{[]byte("POST /post HTTP/1.1\r\nContent-Length: 7\r\nHost: www.w3.or"), []byte("g\r\nUser-Ag"), []byte("ent:Chrome\r\n\r\n"), []byte("Fake-Header: asda")}
+
+	headers := make(map[string]string)
+
+	ParseHeaders(payload, func(header []byte, value []byte) bool {
+		headers[string(header)] = string(value)
+		return true
+	})
+
+	expected := map[string]string{
+		"Content-Length": "7",
+		"Host":           "www.w3.org",
+		"User-Agent":     "Chrome",
+	}
+
+	if !reflect.DeepEqual(headers, expected) {
+		t.Error("Headers do not properly parsed", headers)
+	}
+}
+
+// See https://github.com/dvyukov/go-fuzz and fuzz.go
+func TestFuzzCrashers(t *testing.T) {
+	var crashers = []string{
+		"\n:00\n",
+	}
+
+	for _, f := range crashers {
+		ParseHeaders([][]byte{[]byte(f)}, func(header []byte, value []byte) bool {
+			return true
+		})
+	}
+}
+
+func TestParseHeadersWithComplexUserAgent(t *testing.T) {
+	// User-Agent could contain inside ':'
+	// Parser should wait for \r\n
+	payload := [][]byte{[]byte("POST /post HTTP/1.1\r\nContent-Length: 7\r\nHost: www.w3.or"), []byte("g\r\nUser-Ag"), []byte("ent:Mozilla/5.0 (Windows NT 6.1; WOW64; Trident/7.0; rv:11.0) like Gecko\r\n\r\n"), []byte("Fake-Header: asda")}
+
+	headers := make(map[string]string)
+
+	ParseHeaders(payload, func(header []byte, value []byte) bool {
+		headers[string(header)] = string(value)
+		return true
+	})
+
+	expected := map[string]string{
+		"User-Agent": "Mozilla/5.0 (Windows NT 6.1; WOW64; Trident/7.0; rv:11.0) like Gecko",
+	}
+
+	if expected["User-Agent"] != headers["User-Agent"] {
+		t.Errorf("Header 'User-Agent' expected '%s' and parsed: '%s'", expected["User-Agent"], headers["User-Agent"])
+	}
+}
+
+func TestParseHeadersWithOrigin(t *testing.T) {
+	// User-Agent could contain inside ':'
+	// Parser should wait for \r\n
+	payload := [][]byte{[]byte("POST /post HTTP/1.1\r\nContent-Length: 7\r\nHost: www.w3.or"), []byte("g\r\nReferrer: http://127.0.0.1:3000\r\nOrigi"), []byte("n: https://www.example.com\r\nUser-Ag"), []byte("ent:Mozilla/5.0 (Windows NT 6.1; WOW64; Trident/7.0; rv:11.0) like Gecko\r\n\r\n"), []byte("in:https://www.example.com\r\n\r\n"), []byte("Fake-Header: asda")}
+
+	headers := make(map[string]string)
+
+	ParseHeaders(payload, func(header []byte, value []byte) bool {
+		headers[string(header)] = string(value)
+		return true
+	})
+
+	expected := map[string]string{
+		"Origin":     "https://www.example.com",
+		"User-Agent": "Mozilla/5.0 (Windows NT 6.1; WOW64; Trident/7.0; rv:11.0) like Gecko",
+		"Referrer":   "http://127.0.0.1:3000",
+	}
+
+	if expected["Referrer"] != headers["Referrer"] {
+		t.Errorf("Header 'Referrer' expected '%s' and parsed: '%s'", expected["Referrer"], headers["Referrer"])
+	}
+
+	if expected["Origin"] != headers["Origin"] {
+		t.Errorf("Header 'Origin' expected '%s' and parsed: '%s'", expected["Origin"], headers["Origin"])
+	}
+
+	if expected["User-Agent"] != headers["User-Agent"] {
+		t.Errorf("Header 'User-Agent' expected '%s' and parsed: '%s'", expected["User-Agent"], headers["User-Agent"])
+	}
+}
+
+func TestHeaderEquals(t *testing.T) {
+	tests := []struct {
+		h1     string
+		h2     string
+		equals bool
+	}{
+		{"Content-Length", "content-length", true},
+		{"content-length", "Content-Length", true},
+		{"content-Pength", "Content-Length", false},
+		{"Host", "Content-Length", false},
+	}
+
+	for _, tc := range tests {
+		if HeadersEqual([]byte(tc.h1), []byte(tc.h2)) != tc.equals {
+			t.Error(tc)
+		}
+	}
+}
+
 func TestPath(t *testing.T) {
 	var path, payload []byte
 
@@ -131,6 +237,24 @@ func TestPath(t *testing.T) {
 	if path = Path(payload); !bytes.Equal(path, []byte("/post")) {
 		t.Error("Should find path", string(path))
 	}
+
+	payload = []byte("GET /get\r\n\r\nHost: www.w3.org\r\n\r\n")
+
+	if path = Path(payload); !bytes.Equal(path, []byte("/get")) {
+		t.Error("Should find path", string(path))
+	}
+
+	payload = []byte("GET /get\n")
+
+	if path = Path(payload); !bytes.Equal(path, []byte("/get")) {
+		t.Error("Should find path", string(path))
+	}
+
+	payload = []byte("GET /get")
+
+	if path = Path(payload); !bytes.Equal(path, []byte("/get")) {
+		t.Error("Should find path", string(path))
+	}
 }
 
 func TestSetPath(t *testing.T) {

protocol.go

@@ -42,13 +42,24 @@ func payloadScanner(data []byte, atEOF bool) (advance int, token []byte, err err
 }
 
 // Timing is request start or round-trip time, depending on payloadType
-func payloadHeader(payloadType byte, uuid []byte, timing int64) (header []byte) {
-	sTime := strconv.FormatInt(timing, 10)
+func payloadHeader(payloadType byte, uuid []byte, timing int64, latency int64) (header []byte) {
+	var sTime, sLatency string
+
+	sTime = strconv.FormatInt(timing, 10)
+	if latency != -1 {
+		sLatency = strconv.FormatInt(latency, 10)
+	}
 
 	//Example:
 	//  3 f45590522cd1838b4a0d5c5aab80b77929dea3b3 1231\n
 	// `+ 1` indicates space characters or end of line
-	header = make([]byte, 1+1+len(uuid)+1+len(sTime)+1)
+	headerLen := 1 + 1 + len(uuid) + 1 + len(sTime) + 1
+
+	if latency != -1 {
+		headerLen += len(sLatency) + 1
+	}
+
+	header = make([]byte, headerLen)
 	header[0] = payloadType
 	header[1] = ' '
 	header[2+len(uuid)] = ' '
@@ -57,6 +68,11 @@ func payloadHeader(payloadType byte, uuid []byte, timing int64) (header []byte)
 	copy(header[2:], uuid)
 	copy(header[3+len(uuid):], sTime)
 
+	if latency != -1 {
+		header[3+len(uuid)+len(sTime)] = ' '
+		copy(header[4+len(uuid)+len(sTime):], sLatency)
+	}
+
 	return header
 }
 

raw_socket_listener/listener.go

@@ -16,9 +16,6 @@ import (
 	"bytes"
 	"encoding/binary"
 	"fmt"
-	"github.com/google/gopacket"
-	"github.com/google/gopacket/layers"
-	"github.com/google/gopacket/pcap"
 	"io"
 	"log"
 	"net"
@@ -28,11 +25,22 @@ import (
 	"strings"
 	"sync"
 	"time"
-	"github.com/buger/gor/proto"
+
+	"github.com/buger/goreplay/proto"
+
+	"github.com/google/gopacket"
+	"github.com/google/gopacket/layers"
+	"github.com/google/gopacket/pcap"
 )
 
 var _ = fmt.Println
 
+type packet struct {
+	srcIP     []byte
+	data      []byte
+	timestamp time.Time
+}
+
 // Listener handle traffic capture
 type Listener struct {
 	mu sync.Mutex
@@ -53,7 +61,7 @@ type Listener struct {
 	respWithoutReq map[uint32]tcpID
 
 	// Messages ready to be send to client
-	packetsChan chan []byte
+	packetsChan chan *packet
 
 	// Messages ready to be send to client
 	messagesChan chan *TCPMessage
@@ -64,6 +72,13 @@ type Listener struct {
 	trackResponse bool
 	messageExpire time.Duration
 
+	bpfFilter     string
+	timestampType string
+	overrideSnapLen bool
+	immediateMode bool
+
+	bufferSize int
+
 	conn        net.PacketConn
 	pcapHandles []*pcap.Handle
 
@@ -81,13 +96,14 @@ type request struct {
 const (
 	EngineRawSocket = 1 << iota
 	EnginePcap
+	EnginePcapFile
 )
 
 // NewListener creates and initializes new Listener object
-func NewListener(addr string, port string, engine int, trackResponse bool, expire time.Duration) (l *Listener) {
+func NewListener(addr string, port string, engine int, trackResponse bool, expire time.Duration, bpfFilter string, timestampType string, bufferSize int, overrideSnapLen bool, immediateMode bool) (l *Listener) {
 	l = &Listener{}
 
-	l.packetsChan = make(chan []byte, 10000)
+	l.packetsChan = make(chan *packet, 10000)
 	l.messagesChan = make(chan *TCPMessage, 10000)
 	l.quit = make(chan bool)
 	l.readyCh = make(chan bool, 1)
@@ -98,6 +114,11 @@ func NewListener(addr string, port string, engine int, trackResponse bool, expir
 	l.respAliases = make(map[uint32]*TCPMessage)
 	l.respWithoutReq = make(map[uint32]tcpID)
 	l.trackResponse = trackResponse
+	l.bpfFilter = bpfFilter
+	l.timestampType = timestampType
+	l.immediateMode = immediateMode
+	l.bufferSize = bufferSize
+	l.overrideSnapLen = overrideSnapLen
 
 	l.addr = addr
 	_port, _ := strconv.Atoi(port)
@@ -114,10 +135,10 @@ func NewListener(addr string, port string, engine int, trackResponse bool, expir
 	// Special case for testing
 	if l.port != 0 {
 		switch engine {
-		case EngineRawSocket:
-			go l.readRAWSocket()
 		case EnginePcap:
 			go l.readPcap()
+		case EnginePcapFile:
+			go l.readPcapFile()
 		default:
 			log.Fatal("Unknown traffic interception engine:", engine)
 		}
@@ -136,9 +157,9 @@ func (t *Listener) listen() {
 				t.conn.Close()
 			}
 			return
-		case data := <-t.packetsChan:
-			packet := ParseTCPPacket(data[:16], data[16:])
-			t.processTCPPacket(packet)
+		case packet := <-t.packetsChan:
+			tcpPacket := ParseTCPPacket(packet.srcIP, packet.data, packet.timestamp)
+			t.processTCPPacket(tcpPacket)
 		case <-gcTicker:
 			now := time.Now()
 
@@ -173,7 +194,14 @@ func (t *Listener) dispatchMessage(message *TCPMessage) {
 
 	t.deleteMessage(message)
 
-	// log.Println("Dispatching, message", message.Start.UnixNano(), message.Seq, message.Ack, string(message.Bytes()))
+	if !message.complete {
+		if !message.IsIncoming {
+			delete(t.respAliases, message.Ack)
+			delete(t.respWithoutReq, message.Ack)
+		}
+
+		return
+	}
 
 	if message.IsIncoming {
 		// If there were response before request
@@ -183,10 +211,10 @@ func (t *Listener) dispatchMessage(message *TCPMessage) {
 				if resp, rok := t.messages[respID]; rok {
 					// if resp.AssocMessage == nil {
 					// log.Println("FOUND RESPONSE")
-					resp.AssocMessage = message
-					message.AssocMessage = resp
+					resp.setAssocMessage(message)
+					message.setAssocMessage(resp)
 
-					if resp.IsFinished() {
+					if resp.complete {
 						defer t.dispatchMessage(resp)
 					}
 					// }
@@ -194,14 +222,14 @@ func (t *Listener) dispatchMessage(message *TCPMessage) {
 			}
 
 			if resp, ok := t.messages[message.ResponseID]; ok {
-				resp.AssocMessage = message
+				resp.setAssocMessage(message)
 			}
 		}
 	} else {
 		if message.AssocMessage == nil {
 			if responseRequest, ok := t.respAliases[message.Ack]; ok {
-				message.AssocMessage = responseRequest
-				responseRequest.AssocMessage = message
+				message.setAssocMessage(responseRequest)
+				responseRequest.setAssocMessage(message)
 			}
 		}
 
@@ -227,7 +255,7 @@ func (e *DeviceNotFoundError) Error() string {
 	devices, _ := pcap.FindAllDevs()
 
 	if len(devices) == 0 {
-		return "Can't get list of network interfaces, ensure that you running Gor as root user or sudo.\nTo run as non-root users see this docs https://github.com/buger/gor/wiki/Running-as-non-root-user"
+		return "Can't get list of network interfaces, ensure that you running Gor as root user or sudo.\nTo run as non-root users see this docs https://github.com/buger/goreplay/wiki/Running-as-non-root-user"
 	}
 
 	var msg string
@@ -245,6 +273,28 @@ func (e *DeviceNotFoundError) Error() string {
 	return msg
 }
 
+func isLoopback(device pcap.Interface) bool {
+	if len(device.Addresses) == 0 {
+		return false
+	}
+
+	switch device.Addresses[0].IP.String() {
+	case "127.0.0.1", "::1":
+		return true
+	}
+
+	return false
+}
+
+func listenAllInterfaces(addr string) bool {
+	switch addr {
+	case "", "0.0.0.0", "[::]", "::":
+		return true
+	default:
+		return false
+	}
+}
+
 func findPcapDevices(addr string) (interfaces []pcap.Interface, err error) {
 	devices, err := pcap.FindAllDevs()
 	if err != nil {
@@ -252,7 +302,7 @@ func findPcapDevices(addr string) (interfaces []pcap.Interface, err error) {
 	}
 
 	for _, device := range devices {
-		if (addr == "" || addr == "0.0.0.0" || addr == "[::]" || addr == "::") && len(device.Addresses) > 0 {
+		if listenAllInterfaces(addr) && len(device.Addresses) > 0 || isLoopback(device) {
 			interfaces = append(interfaces, device)
 			continue
 		}
@@ -267,9 +317,9 @@ func findPcapDevices(addr string) (interfaces []pcap.Interface, err error) {
 
 	if len(interfaces) == 0 {
 		return nil, &DeviceNotFoundError{addr}
-	} else {
-		return interfaces, nil
 	}
+
+	return interfaces, nil
 }
 
 func (t *Listener) readPcap() {
@@ -288,24 +338,71 @@ func (t *Listener) readPcap() {
 
 	for _, d := range devices {
 		go func(device pcap.Interface) {
-			handle, err := pcap.OpenLive(device.Name, 65536, true, t.messageExpire)
+			inactive, err := pcap.NewInactiveHandle(device.Name)
 			if err != nil {
 				log.Println("Pcap Error while opening device", device.Name, err)
 				wg.Done()
 				return
 			}
+
+			if t.timestampType != "" {
+				if tt, terr := pcap.TimestampSourceFromString(t.timestampType); terr != nil {
+					log.Println("Supported timestamp types: ", inactive.SupportedTimestamps(), device.Name)
+				} else if terr := inactive.SetTimestampSource(tt); terr != nil {
+					log.Println("Supported timestamp types: ", inactive.SupportedTimestamps(), device.Name)
+				}
+			}
+
+			if it, err := net.InterfaceByName(device.Name); err == nil && !t.overrideSnapLen {
+				// Auto-guess max length of packet to capture
+				inactive.SetSnapLen(it.MTU + 68*2)
+			} else {
+				inactive.SetSnapLen(65536)
+			}
+
+			inactive.SetTimeout(t.messageExpire)
+			inactive.SetPromisc(true)
+			inactive.SetImmediateMode(t.immediateMode)
+			if t.immediateMode {
+				log.Println("Setting immediate mode")
+			}
+			if t.bufferSize > 0 {
+				inactive.SetBufferSize(t.bufferSize)
+			}
+
+			handle, herr := inactive.Activate()
+			if herr != nil {
+				log.Println("PCAP Activate error:", herr)
+				wg.Done()
+				return
+			}
+
 			defer handle.Close()
 
 			t.mu.Lock()
 			t.pcapHandles = append(t.pcapHandles, handle)
 
 			var bpfDstHost, bpfSrcHost string
-			for i, addr := range device.Addresses {
-				bpfDstHost += "dst host " + addr.IP.String()
-				bpfSrcHost += "src host " + addr.IP.String()
-				if i != len(device.Addresses) - 1 {
-					bpfDstHost += " or "
-					bpfSrcHost += " or "
+			var loopback = isLoopback(device)
+
+			if loopback {
+				var allAddr []string
+				for _, dc := range devices {
+					for _, addr := range dc.Addresses {
+						allAddr = append(allAddr, "(dst host "+addr.IP.String()+" and src host "+addr.IP.String()+")")
+					}
+				}
+
+				bpfDstHost = strings.Join(allAddr, " or ")
+				bpfSrcHost = bpfDstHost
+			} else {
+				for i, addr := range device.Addresses {
+					bpfDstHost += "dst host " + addr.IP.String()
+					bpfSrcHost += "src host " + addr.IP.String()
+					if i != len(device.Addresses)-1 {
+						bpfDstHost += " or "
+						bpfSrcHost += " or "
+					}
 				}
 			}
 
@@ -318,6 +415,10 @@ func (t *Listener) readPcap() {
 					bpf = "tcp dst port " + strconv.Itoa(int(t.port)) + " and (" + bpfDstHost + ")"
 				}
 
+				if t.bpfFilter != "" {
+					bpf = t.bpfFilter
+				}
+
 				if err := handle.SetBPFFilter(bpf); err != nil {
 					log.Println("BPF filter error:", err, "Device:", device.Name, bpf)
 					wg.Done()
@@ -330,9 +431,9 @@ func (t *Listener) readPcap() {
 
 			// Special case for tunnel interface https://github.com/google/gopacket/issues/99
 			if handle.LinkType() == 12 {
-			    decoder = layers.LayerTypeIPv4
+				decoder = layers.LayerTypeIPv4
 			} else {
-			    decoder = handle.LinkType()
+				decoder = handle.LinkType()
 			}
 
 			source := gopacket.NewPacketSource(handle, decoder)
@@ -355,28 +456,29 @@ func (t *Listener) readPcap() {
 				// We should remove network layer before parsing TCP/IP data
 				var of int
 				switch decoder {
-					case layers.LinkTypeEthernet:
-						of = 14
-					case layers.LinkTypePPP:
-						of = 1
-					case layers.LinkTypeFDDI:
-						of = 13
-					case layers.LinkTypeNull:
-						of = 4
-					case layers.LinkTypeLoop:
-						of = 4
-					case layers.LinkTypeRaw:
-						of = 0
-					case layers.LinkTypeLinuxSLL:
-						of = 16
-					default:
-						log.Println("Unknown packet layer", packet)
-						break
+				case layers.LinkTypeEthernet:
+					of = 14
+				case layers.LinkTypePPP:
+					of = 1
+				case layers.LinkTypeFDDI:
+					of = 13
+				case layers.LinkTypeNull:
+					of = 4
+				case layers.LinkTypeLoop:
+					of = 4
+				case layers.LinkTypeRaw, layers.LayerTypeIPv4:
+					of = 0
+				case layers.LinkTypeLinuxSLL:
+					of = 16
+				default:
+					log.Println("Unknown packet layer", decoder, packet)
+					break
 				}
 
 				data = packet.Data()[of:]
 
 				version := uint8(data[0]) >> 4
+				ipLength := int(binary.BigEndian.Uint16(data[2:4]))
 
 				if version == 4 {
 					ihl := uint8(data[0]) & 0x0F
@@ -388,6 +490,24 @@ func (t *Listener) readPcap() {
 
 					srcIP = data[12:16]
 					dstIP = data[16:20]
+
+					// Too small IP packet
+					if ipLength < 20 {
+						continue
+					}
+
+					// Invalid length
+					if int(ihl*4) > ipLength {
+						continue
+					}
+
+					if cmp := len(data) - ipLength; cmp > 0 {
+						data = data[:ipLength]
+					} else if cmp < 0 {
+						// Truncated packet
+						continue
+					}
+
 					data = data[ihl*4:]
 				} else {
 					// Truncated IP info
@@ -402,15 +522,16 @@ func (t *Listener) readPcap() {
 				}
 
 				// Truncated TCP info
-				if len(data) < 13 {
+				if len(data) <= 13 {
 					continue
 				}
 
 				dataOffset := (data[12] & 0xF0) >> 4
+				isFIN := data[13]&0x01 != 0
 
 				// We need only packets with data inside
 				// Check that the buffer is larger than the size of the TCP header
-				if len(data) > int(dataOffset*4) {
+				if len(data) > int(dataOffset*4) || isFIN {
 					if !bpfSupported {
 						destPort := binary.BigEndian.Uint16(data[2:4])
 						srcPort := binary.BigEndian.Uint16(data[0:2])
@@ -430,10 +551,26 @@ func (t *Listener) readPcap() {
 						}
 
 						addrMatched := false
-						for _, a := range device.Addresses {
-							if a.IP.Equal(net.IP(addrCheck)) {
-								addrMatched = true
-								break
+
+						if loopback {
+							for _, dc := range devices {
+								if addrMatched {
+									break
+								}
+								for _, a := range dc.Addresses {
+									if a.IP.Equal(net.IP(addrCheck)) {
+										addrMatched = true
+										break
+									}
+								}
+							}
+							addrMatched = true
+						} else {
+							for _, a := range device.Addresses {
+								if a.IP.Equal(net.IP(addrCheck)) {
+									addrMatched = true
+									break
+								}
 							}
 						}
 
@@ -442,11 +579,7 @@ func (t *Listener) readPcap() {
 						}
 					}
 
-					newBuf := make([]byte, len(data)+16)
-					copy(newBuf[:16], srcIP)
-					copy(newBuf[16:], data)
-
-					t.packetsChan <- newBuf
+					t.packetsChan <- t.buildPacket(srcIP, data, packet.Metadata().Timestamp)
 				}
 			}
 		}(d)
@@ -456,6 +589,71 @@ func (t *Listener) readPcap() {
 	t.readyCh <- true
 }
 
+func (t *Listener) readPcapFile() {
+	if handle, err := pcap.OpenOffline(t.addr); err != nil {
+		log.Fatal(err)
+	} else {
+		if t.bpfFilter != "" {
+			if err := handle.SetBPFFilter(t.bpfFilter); err != nil {
+				log.Println("BPF filter error:", err)
+				return
+			}
+		}
+
+		t.readyCh <- true
+		packetSource := gopacket.NewPacketSource(handle, handle.LinkType())
+
+		for {
+			packet, err := packetSource.NextPacket()
+			if err == io.EOF {
+				break
+			} else if err != nil {
+				log.Println("Error:", err)
+				continue
+			}
+
+			var addr, data []byte
+
+			if tcpLayer := packet.Layer(layers.LayerTypeTCP); tcpLayer != nil {
+				tcp, _ := tcpLayer.(*layers.TCP)
+				data = append(tcp.LayerContents(), tcp.LayerPayload()...)
+
+				if uint16(tcp.DstPort) == t.port {
+					copy(data[0:2], []byte{byte(tcp.SrcPort >> 8), byte(tcp.SrcPort)})
+					copy(data[2:4], []byte{byte(tcp.DstPort >> 8), byte(tcp.DstPort)})
+				} else {
+					copy(data[0:2], []byte{byte(tcp.DstPort >> 8), byte(tcp.DstPort)})
+					copy(data[2:4], []byte{byte(tcp.SrcPort >> 8), byte(tcp.SrcPort)})
+				}
+			} else {
+				continue
+			}
+
+			if ipLayer := packet.Layer(layers.LayerTypeIPv4); ipLayer != nil {
+				ip, _ := ipLayer.(*layers.IPv4)
+				addr = ip.SrcIP
+			} else if ipLayer = packet.Layer(layers.LayerTypeIPv6); ipLayer != nil {
+				ip, _ := ipLayer.(*layers.IPv6)
+				addr = ip.SrcIP
+			} else {
+				// log.Println("Can't find IP layer", packet)
+				continue
+			}
+
+			dataOffset := (data[12] & 0xF0) >> 4
+			isFIN := data[13]&0x01 != 0
+
+			// We need only packets with data inside
+			// Check that the buffer is larger than the size of the TCP header
+			if len(data) <= int(dataOffset*4) && !isFIN {
+				continue
+			}
+
+			t.packetsChan <- t.buildPacket(addr, data, packet.Metadata().Timestamp)
+		}
+	}
+}
+
 func (t *Listener) readRAWSocket() {
 	conn, e := net.ListenPacket("ip:tcp", t.addr)
 	t.conn = conn
@@ -484,16 +682,20 @@ func (t *Listener) readRAWSocket() {
 
 		if n > 0 {
 			if t.isValidPacket(buf[:n]) {
-				newBuf := make([]byte, n+16)
-				copy(newBuf[16:], buf[:n])
-				copy(newBuf[:16], []byte(addr.(*net.IPAddr).IP))
-
-				t.packetsChan <- newBuf
+				t.packetsChan <- t.buildPacket([]byte(addr.(*net.IPAddr).IP), buf[:n], time.Now())
 			}
 		}
 	}
 }
 
+func (t *Listener) buildPacket(packetSrcIP []byte, packetData []byte, timestamp time.Time) *packet {
+	return &packet{
+		srcIP:     packetSrcIP,
+		data:      packetData,
+		timestamp: timestamp,
+	}
+}
+
 func (t *Listener) isValidPacket(buf []byte) bool {
 	// To avoid full packet parsing every time, we manually parsing values needed for packet filtering
 	// http://en.wikipedia.org/wiki/Transmission_Control_Protocol
@@ -516,11 +718,6 @@ func (t *Listener) isValidPacket(buf []byte) bool {
 	return false
 }
 
-var bExpectHeader = []byte("Expect:")
-var bExpect100Value = []byte("100-continue")
-var bPOST = []byte("POST")
-var bCRLFx2 = []byte("\r\n\r\n")
-
 // Trying to add packet to existing message or creating new message
 //
 // For TCP message unique id is Acknowledgment number (see tcp_packet.go)
@@ -532,21 +729,31 @@ func (t *Listener) processTCPPacket(packet *TCPPacket) {
 		}
 	}()
 
-	// log.Println("Processing packet:", packet.Ack, packet.Seq, packet.ID)
-
+	var responseRequest *TCPMessage
 	var message *TCPMessage
 
 	isIncoming := packet.DestPort == t.port
 
+	if !isIncoming {
+		responseRequest, _ = t.respAliases[packet.Ack]
+	}
+
 	// Seek for 100-expect chunks
-	if parentAck, ok := t.seqWithData[packet.Seq]; ok {
+	// `packet.Ack != parentAck` is protection for clients who send data without ignoring server 100-continue response, e.g have data chunks have same Ack
+	if parentAck, ok := t.seqWithData[packet.Seq]; ok && packet.Ack != parentAck {
+		// Skip zero-length chunks https://github.com/buger/goreplay/issues/496
+		if len(packet.Data) == 0 {
+			return
+		}
+
 		// In case if non-first data chunks comes first
 		for _, m := range t.messages {
 			if m.Ack == packet.Ack && bytes.Equal(m.packets[0].Addr, packet.Addr) {
 				t.deleteMessage(m)
 
 				if m.AssocMessage != nil {
-					m.AssocMessage.AssocMessage = nil
+					m.AssocMessage.setAssocMessage(nil)
+					m.setAssocMessage(nil)
 				}
 
 				for _, pkt := range m.packets {
@@ -562,26 +769,28 @@ func (t *Listener) processTCPPacket(packet *TCPPacket) {
 		packet.UpdateAck(parentAck)
 	}
 
-	if alias, ok := t.ackAliases[packet.Ack]; ok {
-		packet.UpdateAck(alias)
+	if isIncoming && packet.IsFIN {
+		if ma, ok := t.respAliases[packet.Seq]; ok {
+			if ma.packets[0].SrcPort == packet.SrcPort {
+				packet.UpdateAck(ma.Ack)
+			}
+		}
 	}
 
-	var responseRequest *TCPMessage
-
-	if !isIncoming {
-		responseRequest, _ = t.respAliases[packet.Ack]
+	if alias, ok := t.ackAliases[packet.Ack]; ok {
+		packet.UpdateAck(alias)
 	}
 
 	message, ok := t.messages[packet.ID]
 
 	if !ok {
-		message = NewTCPMessage(packet.Seq, packet.Ack, isIncoming)
+		message = NewTCPMessage(packet.Seq, packet.Ack, isIncoming, packet.timestamp)
 		t.messages[packet.ID] = message
 
 		if !isIncoming {
 			if responseRequest != nil {
-				message.AssocMessage = responseRequest
-				responseRequest.AssocMessage = message
+				message.setAssocMessage(responseRequest)
+				responseRequest.setAssocMessage(message)
 			} else {
 				t.respWithoutReq[packet.Ack] = packet.ID
 			}
@@ -592,41 +801,42 @@ func (t *Listener) processTCPPacket(packet *TCPPacket) {
 	message.AddPacket(packet)
 
 	// Handling Expect: 100-continue requests
-	if len(packet.Data) > 4 && bytes.Equal(packet.Data[0:4], bPOST) {
-		// reading last 8 bytes for double CRLF
-		if bytes.Equal(packet.Data[len(packet.Data)-4:], bCRLFx2) {
-			// look for an expect:100-continue header
-			if bytes.Equal(bExpect100Value, proto.Header(packet.Data, bExpectHeader)) {
-				seq := packet.Seq + uint32(len(packet.Data))
-				t.seqWithData[seq] = packet.Ack
-				message.DataSeq = seq
+	if message.expectType == httpExpect100Continue && len(message.packets) == message.headerPacket+1 {
+		seq := packet.Seq + uint32(len(packet.Data))
+		t.seqWithData[seq] = packet.Ack
 
-				// In case if sequence packet came first
-				for _, m := range t.messages {
-					if m.Seq == seq {
-						t.deleteMessage(m)
-						if m.AssocMessage != nil {
-							message.AssocMessage = m.AssocMessage
-						}
-						// log.Println("2: Adding ack alias:", m.Ack, packet.Ack)
-						t.ackAliases[m.Ack] = packet.Ack
+		message.DataSeq = seq
+		message.complete = false
 
-						for _, pkt := range m.packets {
-							pkt.UpdateAck(packet.Ack)
-							message.AddPacket(pkt)
-						}
-					}
+		// In case if sequence packet came first
+		for _, m := range t.messages {
+			if m.Seq == seq {
+				t.deleteMessage(m)
+				if m.AssocMessage != nil {
+					message.setAssocMessage(m.AssocMessage)
+					m.AssocMessage.setAssocMessage(nil)
 				}
 
-				// Removing `Expect: 100-continue` header
-				packet.Data = proto.DelHeader(packet.Data, bExpectHeader)
+				t.ackAliases[m.Ack] = packet.Ack
 
-				// log.Println(string(packet.Data))
+				for _, pkt := range m.packets {
+					pkt.UpdateAck(packet.Ack)
+					message.AddPacket(pkt)
+				}
 			}
 		}
+
+		// Removing `Expect: 100-continue` header
+		packet.Data = proto.DeleteHeader(packet.Data, bExpectHeader)
 	}
 
-	// log.Println("Received message:", string(message.Bytes()), message.ID(), t.messages)
+	// If client do sends Expect: 100-continue but do not respect server response
+	if message.expectType == httpExpect100Continue && (message.headerPacket != -1 && len(message.packets) > message.headerPacket+1) {
+		delete(t.seqWithData, message.DataSeq)
+		seq := packet.Seq + uint32(len(packet.Data))
+		t.seqWithData[seq] = packet.Ack
+		message.DataSeq = seq
+	}
 
 	if isIncoming {
 		// If message have multiple packets, delete previous alias
@@ -639,15 +849,18 @@ func (t *Listener) processTCPPacket(packet *TCPPacket) {
 	}
 
 	// If message contains only single packet immediately dispatch it
-	if message.IsFinished() {
+	if message.complete {
+		// log.Println("COMPLETE!", isIncoming, message)
 		if isIncoming {
-			// log.Println("I'm finished", string(message.Bytes()), message.ResponseID, t.messages)
 			if t.trackResponse {
+				// log.Println("Found response!", message.ResponseID, t.messages)
+
 				if resp, ok := t.messages[message.ResponseID]; ok {
-					t.dispatchMessage(message)
-					if resp.IsFinished() {
+					if resp.complete {
 						t.dispatchMessage(resp)
 					}
+
+					t.dispatchMessage(message)
 				}
 			} else {
 				t.dispatchMessage(message)
@@ -658,7 +871,7 @@ func (t *Listener) processTCPPacket(packet *TCPPacket) {
 			}
 
 			if req, ok := t.messages[message.AssocMessage.ID()]; ok {
-				if req.IsFinished() {
+				if req.complete {
 					t.dispatchMessage(req)
 					t.dispatchMessage(message)
 				}

raw_socket_listener/listener_test.go

@@ -12,16 +12,194 @@ import (
 func TestRawListenerInput(t *testing.T) {
 	var req, resp *TCPMessage
 
-	listener := NewListener("", "0", EnginePcap, true, 10*time.Millisecond)
+	listener := NewListener("", "0", EnginePcap, true, 10*time.Millisecond, "", "", 0, false)
 	defer listener.Close()
 
-	reqPacket := buildPacket(true, 1, 1, []byte("GET / HTTP/1.1\r\n\r\n"))
+	reqPacket := buildPacket(true, 1, 1, []byte("GET / HTTP/1.1\r\n\r\n"), time.Now())
 
 	respAck := reqPacket.Seq + uint32(len(reqPacket.Data))
-	respPacket := buildPacket(false, respAck, reqPacket.Seq+1, []byte("HTTP/1.1 200 OK\r\n\r\n"))
+	respPacket := buildPacket(false, respAck, reqPacket.Seq+1, []byte("HTTP/1.1 200 OK\r\n\r\n"), time.Now())
 
-	listener.packetsChan <- reqPacket.Dump()
-	listener.packetsChan <- respPacket.Dump()
+	listener.packetsChan <- reqPacket.dump()
+	listener.packetsChan <- respPacket.dump()
+
+	select {
+	case req = <-listener.messagesChan:
+	case <-time.After(time.Millisecond):
+		t.Error("Should return request immediately")
+		return
+	}
+
+	if !req.IsIncoming {
+		t.Error("Should be request")
+	}
+
+	select {
+	case resp = <-listener.messagesChan:
+	case <-time.After(20 * time.Millisecond):
+		t.Error("Should return response immediately")
+		return
+	}
+
+	if resp.IsIncoming {
+		t.Error("Should be response")
+	}
+}
+
+func firstPacket(payload []byte) *TCPPacket {
+	return buildPacket(
+		true,
+		1,
+		1,
+		payload,
+		time.Now(),
+	)
+}
+
+func nextPacket(prev *TCPPacket, payload []byte) *TCPPacket {
+	return buildPacket(
+		prev.SrcPort == 1,
+		prev.Ack,
+		prev.Seq+uint32(len(prev.Data)),
+		payload,
+		prev.timestamp.Add(time.Millisecond),
+	)
+}
+
+func responsePacket(prev *TCPPacket, payload []byte) *TCPPacket {
+	return buildPacket(
+		!(prev.SrcPort == 1),
+		prev.Seq+uint32(len(prev.Data)),
+		prev.Ack,
+		payload,
+		prev.timestamp.Add(time.Millisecond),
+	)
+}
+
+func TestHEADRequestNoBody(t *testing.T) {
+	listener := NewListener("", "0", EnginePcap, true, 10*time.Millisecond, "", "", 0, false)
+	defer listener.Close()
+
+	reqPacket := firstPacket([]byte("HEAD / HTTP/1.1\r\nContent-Length: 0\r\n\r\n"))
+	respPacket := responsePacket(reqPacket, []byte("HTTP/1.1 200 OK\r\nContent-Length: 100\r\n\r\n"))
+
+	listener.packetsChan <- reqPacket.dump()
+	listener.packetsChan <- respPacket.dump()
+
+	var req, resp *TCPMessage
+	select {
+	case req = <-listener.messagesChan:
+	case <-time.After(time.Millisecond):
+		t.Error("Should return request immediately")
+		return
+	}
+
+	if !req.IsIncoming {
+		t.Error("Should be request")
+	}
+
+	select {
+	case resp = <-listener.messagesChan:
+	case <-time.After(20 * time.Millisecond):
+		t.Error("Should return response immediately")
+		return
+	}
+
+	if resp.IsIncoming {
+		t.Error("Should be response")
+	}
+}
+
+func TestSingleAck100Continue(t *testing.T) {
+	listener := NewListener("", "0", EnginePcap, true, 10*time.Millisecond, "", "", 0, false)
+	defer listener.Close()
+
+	reqPacket1 := firstPacket([]byte("POST / HTTP/1.1\r\nExpect: 100-continue\r\nContent-Length: 4\r\n\r\n"))
+	respPacket1 := responsePacket(reqPacket1, []byte(""))
+	respPacket2 := responsePacket(reqPacket1, []byte("HTTP/1.1 100 Continue\r\n"))
+	reqPacket2 := responsePacket(respPacket2, []byte("DATA"))
+	respPacket3 := responsePacket(reqPacket2, []byte("HTTP/1.1 200 OK\r\n\r\n"))
+
+	result := []byte("POST / HTTP/1.1\r\nContent-Length: 4\r\n\r\nDATA")
+
+	testRawListener100Continue(t, listener, result,
+		reqPacket1,
+		respPacket1, respPacket2,
+		reqPacket2,
+		respPacket3)
+}
+
+func Test100ContinueWithoutWaiting(t *testing.T) {
+	listener := NewListener("", "0", EnginePcap, true, 10*time.Millisecond, "", "", 0, false)
+	defer listener.Close()
+
+	req1 := firstPacket([]byte("POST / HTTP/1.1\r\nExpect: 100-continue\r\nContent-Length: 4\r\n\r\n"))
+	req2 := nextPacket(req1, []byte("DATA"))
+	resp1 := responsePacket(req1, []byte("HTTP/1.1 100 Continue\r\n"))
+	resp2 := responsePacket(req2, []byte("HTTP/1.1 200 OK\r\n\r\n"))
+
+	result := []byte("POST / HTTP/1.1\r\nContent-Length: 4\r\n\r\nDATA")
+
+	testRawListener100Continue(t, listener, result,
+		req1, req2, resp1, resp2)
+}
+
+// Client first sends data without waiting 100-continue, but once response received, generate packets based on Ack payload
+func Test100ContinueMixed(t *testing.T) {
+	listener := NewListener("", "0", EnginePcap, true, 10*time.Millisecond, "", "", 0, false)
+	defer listener.Close()
+
+	req1 := firstPacket([]byte("POST / HTTP/1.1\r\nExpect: 100-continue\r\nContent-Length: 12\r\n\r\n"))
+	req2 := nextPacket(req1, []byte("DAT1"))
+	resp1 := responsePacket(req1, []byte("HTTP/1.1 100 Continue\r\n\r\n"))
+	req3 := responsePacket(resp1, []byte("DAT2"))
+	req3.Seq = req2.Seq + uint32(len(req2.Data))
+	req4 := nextPacket(req3, []byte("DAT3"))
+	resp2 := responsePacket(req4, []byte("HTTP/1.1 200 OK\r\n\r\n"))
+
+	result := []byte("POST / HTTP/1.1\r\nContent-Length: 12\r\n\r\nDAT1DAT2DAT3")
+
+	testRawListener100Continue(t, listener, result,
+		req1, req2, req3, req4, resp1, resp2)
+}
+
+func TestDoubleAck100Continue(t *testing.T) {
+	listener := NewListener("", "0", EnginePcap, true, 10*time.Millisecond, "", "", 0, false)
+	defer listener.Close()
+
+	reqPacket1 := firstPacket([]byte("POST / HTTP/1.1\r\nExpect: 100-continue\r\nContent-Length: 4\r\n\r\n"))
+
+	respPacket1 := responsePacket(reqPacket1, []byte(""))
+	respPacket2 := responsePacket(reqPacket1, []byte("HTTP/1.1 100 Continue\r\n"))
+	reqPacket2 := responsePacket(respPacket2, []byte(""))
+	reqPacket3 := responsePacket(respPacket2, []byte("DATA"))
+	respPacket3 := responsePacket(reqPacket3, []byte("HTTP/1.1 200 OK\r\n\r\n"))
+
+	result := []byte("POST / HTTP/1.1\r\nContent-Length: 4\r\n\r\nDATA")
+
+	testRawListener100Continue(t, listener, result,
+		reqPacket1,
+		respPacket1, respPacket2,
+		reqPacket2, reqPacket3,
+		respPacket3)
+}
+
+func TestRawListenerInputResponseByClose(t *testing.T) {
+	var req, resp *TCPMessage
+
+	listener := NewListener("", "0", EnginePcap, true, 10*time.Millisecond, "", "", 0, false)
+	defer listener.Close()
+
+	reqPacket := buildPacket(true, 1, 1, []byte("GET / HTTP/1.1\r\n\r\n"), time.Now())
+
+	respAck := reqPacket.Seq + uint32(len(reqPacket.Data))
+	respPacket := buildPacket(false, respAck, reqPacket.Seq+1, []byte("HTTP/1.1 200 OK\r\nConnection: close\r\n\r\nasd"), time.Now())
+	finPacket := buildPacket(false, respAck, reqPacket.Seq+2, []byte(""), time.Now())
+	finPacket.IsFIN = true
+
+	listener.packetsChan <- reqPacket.dump()
+	listener.packetsChan <- respPacket.dump()
+	listener.packetsChan <- finPacket.dump()
 
 	select {
 	case req = <-listener.messagesChan:
@@ -49,12 +227,12 @@ func TestRawListenerInput(t *testing.T) {
 func TestRawListenerInputWithoutResponse(t *testing.T) {
 	var req *TCPMessage
 
-	listener := NewListener("", "0", EnginePcap, false, 10*time.Millisecond)
+	listener := NewListener("", "0", EnginePcap, false, 10*time.Millisecond, "", "", 0, false)
 	defer listener.Close()
 
-	reqPacket := buildPacket(true, 1, 1, []byte("GET / HTTP/1.1\r\n\r\n"))
+	reqPacket := buildPacket(true, 1, 1, []byte("GET / HTTP/1.1\r\n\r\n"), time.Now())
 
-	listener.packetsChan <- reqPacket.Dump()
+	listener.packetsChan <- reqPacket.dump()
 
 	select {
 	case req = <-listener.messagesChan:
@@ -71,15 +249,15 @@ func TestRawListenerInputWithoutResponse(t *testing.T) {
 func TestRawListenerResponse(t *testing.T) {
 	var req, resp *TCPMessage
 
-	listener := NewListener("", "0", EnginePcap, true, 10*time.Millisecond)
+	listener := NewListener("", "0", EnginePcap, true, 10*time.Millisecond, "", "", 0, false)
 	defer listener.Close()
 
-	reqPacket := buildPacket(true, 1, 1, []byte("GET / HTTP/1.1\r\n\r\n"))
-	respPacket := buildPacket(false, 1+uint32(len(reqPacket.Data)), 2, []byte("HTTP/1.1 200 OK\r\n\r\n"))
+	reqPacket := firstPacket([]byte("GET / HTTP/1.1\r\n\r\n"))
+	respPacket := responsePacket(reqPacket, []byte("HTTP/1.1 200 OK\r\n\r\n"))
 
 	// If response packet comes before request
-	listener.packetsChan <- respPacket.Dump()
-	listener.packetsChan <- reqPacket.Dump()
+	listener.packetsChan <- respPacket.dump()
+	listener.packetsChan <- reqPacket.dump()
 
 	select {
 	case req = <-listener.messagesChan:
@@ -108,70 +286,43 @@ func TestRawListenerResponse(t *testing.T) {
 	}
 }
 
+func get100ContinuePackets() (req []*TCPPacket, resp []*TCPPacket) {
+	req1 := firstPacket([]byte("POST / HTTP/1.1\r\nExpect: 100-continue\r\nContent-Length: 2\r\n\r\n"))
+	resp1 := responsePacket(req1, []byte("HTTP/1.1 100 Continue\r\n"))
+	req2 := responsePacket(resp1, []byte("a"))
+	req3 := nextPacket(req2, []byte("b"))
+	resp2 := responsePacket(req3, []byte("HTTP/1.1 200 OK\r\n\r\n"))
+
+	return []*TCPPacket{req1, req2, req3}, []*TCPPacket{resp1, resp2}
+}
+
 func TestShort100Continue(t *testing.T) {
-	listener := NewListener("", "0", EnginePcap, true, 10*time.Millisecond)
+	listener := NewListener("", "0", EnginePcap, true, 10*time.Millisecond, "", "", 0, false)
 	defer listener.Close()
 
-	reqPacket1 := buildPacket(true, 1, 1, []byte("POST / HTTP/1.1\r\nContent-Length: 2\r\nExpect: 100-continue\r\n\r\n"))
-	// Packet with data have different Seq
-	reqPacket2 := buildPacket(true, 2, reqPacket1.Seq+uint32(len(reqPacket1.Data)), []byte("a"))
-	reqPacket3 := buildPacket(true, 2, reqPacket2.Seq+1, []byte("b"))
-
-	respPacket1 := buildPacket(false, 10, 3, []byte("HTTP/1.1 100 Continue\r\n"))
-
-	// panic(int(uint32(len(reqPacket1.Data)) + uint32(len(reqPacket2.Data)) + uint32(len(reqPacket3.Data))))
-	respPacket2 := buildPacket(false, reqPacket3.Seq+1 /* len of data */, 2, []byte("HTTP/1.1 200 OK\r\n"))
+	req, resp := get100ContinuePackets()
 
 	result := []byte("POST / HTTP/1.1\r\nContent-Length: 2\r\n\r\nab")
 
-	testRawListener100Continue(t, listener, result, reqPacket1, reqPacket2, reqPacket3, respPacket1, respPacket2)
+	testRawListener100Continue(t, listener, result, req[0], req[1], req[2], resp[0], resp[1])
 }
 
 // Response comes before Request
 func Test100ContinueWrongOrder(t *testing.T) {
-	listener := NewListener("", "0", EnginePcap, true, 10*time.Millisecond)
+	listener := NewListener("", "0", EnginePcap, true, 10*time.Millisecond, "", "", 0, false)
 	defer listener.Close()
 
-	reqPacket1 := buildPacket(true, 1, 1, []byte("POST / HTTP/1.1\r\nContent-Length: 2\r\nExpect: 100-continue\r\n\r\n"))
-	// Packet with data have different Seq
-	reqPacket2 := buildPacket(true, 2, reqPacket1.Seq+uint32(len(reqPacket1.Data)), []byte("a"))
-	reqPacket3 := buildPacket(true, 2, reqPacket2.Seq+1, []byte("b"))
-
-	respPacket1 := buildPacket(false, 10, 3, []byte("HTTP/1.1 100 Continue\r\n"))
-
-	// panic(int(uint32(len(reqPacket1.Data)) + uint32(len(reqPacket2.Data)) + uint32(len(reqPacket3.Data))))
-	respPacket2 := buildPacket(false, reqPacket3.Seq+1 /* len of data */, 2, []byte("HTTP/1.1 200 OK\r\n"))
+	req, resp := get100ContinuePackets()
 
 	result := []byte("POST / HTTP/1.1\r\nContent-Length: 2\r\n\r\nab")
 
-	testRawListener100Continue(t, listener, result, respPacket1, respPacket2, reqPacket1, reqPacket2, reqPacket3)
+	testRawListener100Continue(t, listener, result, resp[0], resp[1], req[0], req[1], req[2])
 }
 
-func TestAlt100ContinueHeaderOrder(t *testing.T) {
-	listener := NewListener("", "0", EnginePcap, true, 10*time.Millisecond)
-	defer listener.Close()
-
-	reqPacket1 := buildPacket(true, 1, 1, []byte("POST / HTTP/1.1\r\nExpect: 100-continue\r\nContent-Length: 2\r\n\r\n"))
-	// Packet with data have different Seq
-	reqPacket2 := buildPacket(true, 2, reqPacket1.Seq+uint32(len(reqPacket1.Data)), []byte("a"))
-	reqPacket3 := buildPacket(true, 2, reqPacket2.Seq+1, []byte("b"))
-
-	respPacket1 := buildPacket(false, 10, 3, []byte("HTTP/1.1 100 Continue\r\n"))
-
-	// panic(int(uint32(len(reqPacket1.Data)) + uint32(len(reqPacket2.Data)) + uint32(len(reqPacket3.Data))))
-	respPacket2 := buildPacket(false, reqPacket3.Seq+1 /* len of data */, 2, []byte("HTTP/1.1 200 OK\r\n"))
-
-	result := []byte("POST / HTTP/1.1\r\nContent-Length: 2\r\n\r\nab")
-
-	testRawListener100Continue(t, listener, result, reqPacket1, reqPacket2, reqPacket3, respPacket1, respPacket2)
-}
-
-
-
 func testRawListener100Continue(t *testing.T, listener *Listener, result []byte, packets ...*TCPPacket) {
 	var req, resp *TCPMessage
 	for _, p := range packets {
-		listener.packetsChan <- p.Dump()
+		listener.packetsChan <- p.dump()
 	}
 
 	select {
@@ -211,7 +362,7 @@ func testChunkedSequence(t *testing.T, listener *Listener, packets ...*TCPPacket
 	var r, req, resp *TCPMessage
 
 	for _, p := range packets {
-		listener.packetsChan <- p.Dump()
+		listener.packetsChan <- p.dump()
 	}
 
 	select {
@@ -311,30 +462,22 @@ func permutation(n int, list []*TCPPacket) []*TCPPacket {
 
 // Response comes before Request
 func TestRawListenerChunkedWrongOrder(t *testing.T) {
-	listener := NewListener("", "0", EnginePcap, true, 10*time.Millisecond)
+	listener := NewListener("", "0", EnginePcap, true, 10*time.Millisecond, "", "", 0, false)
 	defer listener.Close()
 
-	reqPacket1 := buildPacket(true, 1, 1, []byte("POST / HTTP/1.1\r\nTransfer-Encoding: chunked\r\nExpect: 100-continue\r\n\r\n"))
-	// Packet with data have different Seq
-	reqPacket2 := buildPacket(true, 2, reqPacket1.Seq+uint32(len(reqPacket1.Data)), []byte("1\r\na\r\n"))
-	reqPacket3 := buildPacket(true, 2, reqPacket2.Seq+uint32(len(reqPacket2.Data)), []byte("1\r\nb\r\n"))
-	reqPacket4 := buildPacket(true, 2, reqPacket3.Seq+uint32(len(reqPacket3.Data)), []byte("0\r\n\r\n"))
+	reqPacket1 := firstPacket([]byte("POST / HTTP/1.1\r\nTransfer-Encoding: chunked\r\nExpect: 100-continue\r\n\r\n"))
 
-	respPacket1 := buildPacket(false, 10, 3, []byte("HTTP/1.1 100 Continue\r\n"))
+	respPacket1 := responsePacket(reqPacket1, []byte("HTTP/1.1 100 Continue\r\n"))
+	reqPacket2 := responsePacket(respPacket1, []byte("1\r\na\r\n"))
+	reqPacket3 := nextPacket(reqPacket2, []byte("1\r\nb\r\n"))
+	reqPacket4 := nextPacket(reqPacket3, []byte("0\r\n\r\n"))
 
-	// panic(int(uint32(len(reqPacket1.Data)) + uint32(len(reqPacket2.Data)) + uint32(len(reqPacket3.Data))))
-	respPacket2 := buildPacket(false, reqPacket4.Seq+5 /* len of data */, 2, []byte("HTTP/1.1 200 OK\r\n"))
+	respPacket2 := responsePacket(reqPacket4, []byte("HTTP/1.1 200 OK\r\n\r\n"))
 
 	// Should re-construct message from all possible combinations
 	for i := 0; i < 6*5*4*3*2*1; i++ {
-
-		if i < 54 || i > 57 {
-			continue
-		}
-
 		packets := permutation(i, []*TCPPacket{reqPacket1, reqPacket2, reqPacket3, reqPacket4, respPacket1, respPacket2})
 
-		t.Log("permutation:", i)
 		testChunkedSequence(t, listener, packets...)
 	}
 }
@@ -343,13 +486,13 @@ func chunkedPostMessage() []*TCPPacket {
 	ack := uint32(rand.Int63())
 	seq := uint32(rand.Int63())
 
-	reqPacket1 := buildPacket(true, ack, seq, []byte("POST / HTTP/1.1\r\nTransfer-Encoding: chunked\r\n\r\n"))
+	reqPacket1 := buildPacket(true, ack, seq, []byte("POST / HTTP/1.1\r\nTransfer-Encoding: chunked\r\n\r\n"), time.Now())
 	// Packet with data have different Seq
-	reqPacket2 := buildPacket(true, ack, seq+47, []byte("1\r\na\r\n"))
-	reqPacket3 := buildPacket(true, ack, reqPacket2.Seq+5, []byte("1\r\nb\r\n"))
-	reqPacket4 := buildPacket(true, ack, reqPacket3.Seq+5, []byte("0\r\n\r\n"))
+	reqPacket2 := buildPacket(true, ack, seq+47, []byte("1\r\na\r\n"), time.Now())
+	reqPacket3 := buildPacket(true, ack, reqPacket2.Seq+5, []byte("1\r\nb\r\n"), time.Now())
+	reqPacket4 := buildPacket(true, ack, reqPacket3.Seq+5, []byte("0\r\n\r\n"), time.Now())
 
-	respPacket := buildPacket(false, reqPacket4.Seq+5 /* len of data */, ack, []byte("HTTP/1.1 200 OK\r\n"))
+	respPacket := buildPacket(false, reqPacket4.Seq+5 /* len of data */, ack, []byte("HTTP/1.1 200 OK\r\n\r\n"), time.Now())
 
 	return []*TCPPacket{
 		reqPacket1, reqPacket2, reqPacket3, reqPacket4, respPacket,
@@ -371,8 +514,8 @@ func postMessage() []*TCPPacket {
 	}
 
 	return []*TCPPacket{
-		buildPacket(true, ack, seq, data),
-		buildPacket(false, seq+uint32(len(data)), seq2, []byte("HTTP/1.1 200 OK\r\n")),
+		buildPacket(true, ack, seq, data, time.Now()),
+		buildPacket(false, seq+uint32(len(data)), seq2, []byte("HTTP/1.1 200 OK\r\n\r\n"), time.Now()),
 	}
 }
 
@@ -382,14 +525,14 @@ func getMessage() []*TCPPacket {
 	seq := uint32(rand.Int63())
 
 	return []*TCPPacket{
-		buildPacket(true, ack, seq, []byte("GET / HTTP/1.1\r\n\r\n")),
-		buildPacket(false, seq+18, seq2, []byte("HTTP/1.1 200 OK\r\n")),
+		buildPacket(true, ack, seq, []byte("GET / HTTP/1.1\r\n\r\n"), time.Now()),
+		buildPacket(false, seq+18, seq2, []byte("HTTP/1.1 200 OK\r\n\r\n"), time.Now()),
 	}
 }
 
 // Response comes before Request
 func TestRawListenerBench(t *testing.T) {
-	l := NewListener("", "0", EnginePcap, true, 200*time.Millisecond)
+	l := NewListener("", "0", EnginePcap, true, 200*time.Millisecond, "", "", 0, false)
 	defer l.Close()
 
 	// Should re-construct message from all possible combinations
@@ -414,7 +557,7 @@ func TestRawListenerBench(t *testing.T) {
 						}
 					}
 
-					l.packetsChan <- p.Dump()
+					l.packetsChan <- p.dump()
 					time.Sleep(time.Millisecond)
 				}
 
@@ -437,3 +580,44 @@ func TestRawListenerBench(t *testing.T) {
 		}
 	}
 }
+
+func TestResponseZeroContentLength(t *testing.T) {
+	var req, resp *TCPMessage
+	listener := NewListener("", "0", EnginePcap, true, 10*time.Millisecond, "", "", 0, false)
+	defer listener.Close()
+
+	reqPacket := firstPacket([]byte("POST /api/setup/install HTTP/1.1\r\nHost: localhost:22936\r\nUser-Agent: curl/7.57.0\r\nAccept: */*\r\nContent-Length: 0\r\nContent-Type: application/x-www-form-urlencoded\r\n\r\n"))
+	respPacket := responsePacket(reqPacket, []byte("HTTP/1.1 200\r\nDate: Fri, 11 May 2018 15:09:10 GMT\r\nServer: Kestrel\r\nCache-Control: no-cache\r\nTransfer-Encoding: chunked\r\n\r\n"))
+	respPacket2 := nextPacket(respPacket, []byte("0\r\n\r\n"))
+
+	// If response packet comes before request
+	listener.packetsChan <- reqPacket.dump()
+	listener.packetsChan <- respPacket.dump()
+	listener.packetsChan <- respPacket2.dump()
+
+	select {
+	case req = <-listener.messagesChan:
+	case <-time.After(time.Millisecond):
+		t.Error("Should return respose immediately")
+		return
+	}
+
+	if !req.IsIncoming {
+		t.Error("Should be request")
+	}
+
+	select {
+	case resp = <-listener.messagesChan:
+	case <-time.After(time.Millisecond):
+		t.Error("Should return response immediately")
+		return
+	}
+
+	if resp.IsIncoming {
+		t.Error("Should be response")
+	}
+
+	if !bytes.Equal(resp.UUID(), req.UUID()) {
+		t.Error("Resp and Req UUID should be equal")
+	}
+}

raw_socket_listener/tcp_message.go

@@ -5,11 +5,13 @@ import (
 	"crypto/sha1"
 	"encoding/binary"
 	"encoding/hex"
-	"github.com/buger/gor/proto"
 	"log"
-	"strconv"
-	"time"
 	"net"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/buger/goreplay/proto"
 )
 
 var _ = log.Println
@@ -36,12 +38,30 @@ type TCPMessage struct {
 	packets []*TCPPacket
 
 	delChan chan *TCPMessage
+
+	/* HTTP specific variables */
+	methodType    httpMethodType
+	bodyType      httpBodyType
+	expectType    httpExpectType
+	seqMissing    bool
+	headerPacket  int
+	contentLength int
+	complete      bool
 }
 
-// NewTCPMessage pointer created from a Acknowledgment number and a channel of messages readuy to be deleted
-func NewTCPMessage(Seq, Ack uint32, IsIncoming bool) (msg *TCPMessage) {
-	msg = &TCPMessage{Seq: Seq, Ack: Ack, IsIncoming: IsIncoming}
-	msg.Start = time.Now()
+// NewTCPMessage pointer created from a sequence and acknowledgment numbers, whether the message is incoming and a timestamp
+// that indicates when the packet was captrued.
+func NewTCPMessage(Seq, Ack uint32, IsIncoming bool, timestamp time.Time) (msg *TCPMessage) {
+	msg = &TCPMessage{Seq: Seq, Ack: Ack, IsIncoming: IsIncoming, Start: timestamp}
+
+	return
+}
+
+func (t *TCPMessage) packetsData() (d [][]byte) {
+	d = make([][]byte, len(t.packets))
+	for i, p := range t.packets {
+		d[i] = p.Data
+	}
 
 	return
 }
@@ -55,15 +75,15 @@ func (t *TCPMessage) Bytes() (output []byte) {
 	return output
 }
 
-// Size returns total body size
+// BodySize returns total body size
 func (t *TCPMessage) BodySize() (size int) {
-	if len(t.packets) == 0 {
+	if len(t.packets) == 0 || t.headerPacket == -1 {
 		return 0
 	}
 
-	size += len(proto.Body(t.packets[0].Data))
+	size += len(proto.Body(t.packets[t.headerPacket].Data))
 
-	for _, p := range t.packets[1:] {
+	for _, p := range t.packets[t.headerPacket+1:] {
 		size += len(p.Data)
 	}
 
@@ -110,121 +130,349 @@ func (t *TCPMessage) AddPacket(packet *TCPPacket) {
 				}
 			}
 		}
-
-		if t.IsIncoming {
-			t.End = time.Now()
-		} else {
-			t.End = time.Now().Add(time.Millisecond)
-		}
-
 		if packet.OrigAck != 0 {
 			t.DataAck = packet.OrigAck
 		}
+
+		if packet.timestamp.Before(t.Start) || t.Start.IsZero() {
+			t.Start = packet.timestamp
+		}
+
+		if packet.timestamp.After(t.End) || t.End.IsZero() {
+			t.End = packet.timestamp
+		}
 	}
+
+	t.checkSeqIntegrity()
+	t.updateHeadersPacket()
+	t.updateMethodType()
+	t.updateBodyType()
+	t.checkIfComplete()
+	t.check100Continue()
 }
 
 // Check if there is missing packet
-func (t *TCPMessage) isSeqMissing() bool {
+func (t *TCPMessage) checkSeqIntegrity() {
 	if len(t.packets) == 1 {
-		return false
+		t.seqMissing = false
 	}
 
-	for i, p := range t.packets {
+	offset := len(t.packets) - 1
+
+	if t.packets[offset].IsFIN {
+		offset--
+
+		if offset < 0 {
+			return
+		}
+	}
+
+	for i, p := range t.packets[:offset] {
+		if p.IsFIN {
+			continue
+		}
+
 		// If final packet
 		if len(t.packets) == i+1 {
-			return false
+			t.seqMissing = false
+			return
 		}
 		np := t.packets[i+1]
 
-		if np.Seq != p.Seq+uint32(len(p.Data)) {
-			return true
+		nextSeq := p.Seq + uint32(len(p.Data))
+
+		if np.Seq != nextSeq {
+			if t.expectType == httpExpect100Continue {
+				if np.Seq != nextSeq+22 {
+					t.seqMissing = true
+					return
+				}
+			} else {
+				t.seqMissing = true
+				return
+			}
 		}
 	}
 
-	return false
+	t.seqMissing = false
 }
 
-var EmptyLine = []byte("\r\n\r\n")
-var ChunkEnd = []byte("0\r\n\r\n")
+var bEmptyLine = []byte("\r\n\r\n")
+var bBR = []byte("\r\n")
+var bChunkEnd = []byte("\r\n0\r\n\r\n")
 
-func (t *TCPMessage) isHeadersReceived() bool {
-	for _, p := range t.packets {
-		if bytes.LastIndex(p.Data, EmptyLine) != -1 {
-			return true
+func (t *TCPMessage) updateHeadersPacket() {
+	if len(t.packets) == 1 {
+		t.headerPacket = -1
+	}
+
+	if t.headerPacket != -1 {
+		return
+	}
+
+	if t.seqMissing {
+		return
+	}
+
+	for i, p := range t.packets {
+		if len(p.Data) >= len(bEmptyLine) {
+			if bytes.LastIndex(p.Data, bEmptyLine) != -1 {
+				t.headerPacket = i
+				return
+			}
+		} else if i > 0 && bytes.Equal(p.Data, bBR) {
+			idx := bytes.LastIndex(t.packets[i-1].Data, bBR)
+			if idx != -1 && idx == len(t.packets[i-1].Data)-len(bBR) {
+				t.headerPacket = i
+				return
+			}
 		}
 	}
 
-	return false
+	return
 }
 
-// isMultipart returns true if message contains from multiple tcp packets
-func (t *TCPMessage) IsFinished() bool {
-	payload := t.packets[0].Data
-
-	if len(payload) < 4 {
-		return true
+// checkIfComplete returns true if all of the packets that compse the message arrived.
+func (t *TCPMessage) checkIfComplete() {
+	if t.seqMissing || t.headerPacket == -1 {
+		// log.Println("Seq missing", t.seqMissing, t.packets)
+		return
 	}
 
-	m := payload[:4]
+	if t.methodType == httpMethodNotFound {
+		// log.Println("Method missing", t.methodType, t.packets)
+		return
+	}
+
+	// Responses can be emitted only if we found request
+	if !t.IsIncoming && t.AssocMessage == nil {
+		// log.Println("Assoc not found", t)
+		return
+	}
+
+	// log.Println("Found?", t)
+
+	switch t.bodyType {
+	case httpBodyEmpty:
+		t.complete = true
+	case httpBodyContentLength:
+		if t.contentLength == 0 || t.contentLength == t.BodySize() {
+			t.complete = true
+		}
+	case httpBodyChunked:
+		lastPacket := t.packets[len(t.packets)-1]
+		if bytes.LastIndex(lastPacket.Data, bChunkEnd) != -1 {
+			t.complete = true
+		}
+	default:
+		if len(t.packets) == 0 {
+			return
+		}
+
+		last := t.packets[len(t.packets)-1]
+		if last.IsFIN {
+			t.complete = true
+		}
+	}
+}
+
+type httpMethodType uint8
+
+const (
+	httpMethodNotSet   httpMethodType = 0
+	httpMethodKnown    httpMethodType = 1
+	httpMethodNotFound httpMethodType = 2
+)
+
+func (t *TCPMessage) updateMethodType() {
+	// if there is cache
+	if t.methodType != httpMethodNotSet && t.methodType != httpMethodNotFound {
+		return
+	}
+
+	d := t.packets[0].Data
+
+	// Minimum length fo request: GET / HTTP/1.1\r\n
+
+	if len(d) < 16 {
+		t.methodType = httpMethodNotFound
+		return
+	}
 
 	if t.IsIncoming {
-		// If one GET, OPTIONS, or HEAD request
-		if bytes.Equal(m, []byte("GET ")) || bytes.Equal(m, []byte("OPTI")) || bytes.Equal(m, []byte("HEAD")) {
-			if !t.isSeqMissing() && t.isHeadersReceived() {
-				return true
-			} else {
-				return false
+		if mIdx := bytes.IndexByte(d[:8], ' '); mIdx != -1 {
+			// Check that after method we have absolute or relative path
+			switch d[mIdx+1] {
+			case '/', 'h', '*':
+			default:
+				t.methodType = httpMethodNotFound
+				return
 			}
 		} else {
-			// Sometimes header comes after the body :(
-			if bytes.Equal(m, []byte("POST")) || bytes.Equal(m, []byte("PUT ")) || bytes.Equal(m, []byte("PATC")) {
-
-				if t.isHeadersReceived() {
-					if length := proto.Header(payload, []byte("Content-Length")); len(length) > 0 {
-						l, _ := strconv.Atoi(string(length))
-
-						// If content-length equal current body length
-						if l > 0 && l == t.BodySize() {
-							return true
-						}
-					}
-				}
-			}
+			t.methodType = httpMethodNotFound
+			return
 		}
+
+		t.methodType = httpMethodKnown
 	} else {
-		// Request not found
-		// Can be because response came first or request request was just missing
-		if t.AssocMessage == nil {
+		if !bytes.Equal(d[:6], []byte("HTTP/1")) {
+			t.methodType = httpMethodNotFound
+			return
+		}
+
+		t.methodType = httpMethodKnown
+	}
+}
+
+type httpBodyType uint8
+
+const (
+	httpBodyNotSet          httpBodyType = 0
+	httpBodyEmpty           httpBodyType = 1
+	httpBodyContentLength   httpBodyType = 2
+	httpBodyChunked         httpBodyType = 3
+	httpBodyConnectionClose httpBodyType = 4
+)
+
+func (t *TCPMessage) updateBodyType() {
+	// if there is cache
+	if t.bodyType != httpBodyNotSet {
+		return
+	}
+
+	// Headers not received
+	if t.headerPacket == -1 {
+		return
+	}
+
+	var lengthB, encB, connB []byte
+
+	proto.ParseHeaders(t.packetsData(), func(header, value []byte) bool {
+		if proto.HeadersEqual(header, []byte("Content-Length")) {
+			lengthB = value
 			return false
 		}
 
-		if !bytes.Equal(m, []byte("HTTP")) {
+		if proto.HeadersEqual(header, []byte("Transfer-Encoding")) {
+			encB = value
 			return false
 		}
 
-		if length := proto.Header(payload, []byte("Content-Length")); len(length) > 0 {
-			if length[0] == '0' {
-				return true
-			}
+		if proto.HeadersEqual(header, []byte("Connection")) {
+			connB = value
+		}
 
-			l, _ := strconv.Atoi(string(length))
+		return true
+	})
 
-			// If content-length equal current body length
-			if l > 0 && l == t.BodySize() {
-				return true
-			}
-		} else {
-			if enc := proto.Header(payload, []byte("Transfer-Encoding")); len(enc) == 0 {
-				return true
+	switch t.methodType {
+	case httpMethodNotFound:
+		return
+	case httpMethodKnown:
+
+		if !t.IsIncoming &&
+			t.AssocMessage != nil &&
+			bytes.IndexByte(t.AssocMessage.Bytes(), ' ') > -1 &&
+			bytes.Equal([]byte("HEAD"), proto.Method(t.AssocMessage.Bytes())) {
+			// Need to check if this is a response to a head request,
+			// in which case the body has to be empty regardless.
+			t.bodyType = httpBodyEmpty
+			return
+		}
+
+		if len(lengthB) > 0 {
+			t.contentLength, _ = strconv.Atoi(string(lengthB))
+			if t.contentLength == 0 {
+				t.bodyType = httpBodyEmpty
 			} else {
-				if len(t.packets) > 1 && bytes.LastIndex(t.packets[len(t.packets)-1].Data, ChunkEnd) != -1 {
-					return true
-				}
+				t.bodyType = httpBodyContentLength
 			}
+			return
+		}
+
+		if len(encB) > 0 {
+			t.bodyType = httpBodyChunked
+			return
+		}
+
+		if len(connB) > 0 && bytes.Equal(connB, []byte("close")) {
+			t.bodyType = httpBodyConnectionClose
+			return
 		}
 	}
 
-	return false
+	t.bodyType = httpBodyEmpty
+}
+
+type httpExpectType uint8
+
+const (
+	httpExpectNotSet      httpExpectType = 0
+	httpExpectEmpty       httpExpectType = 1
+	httpExpect100Continue httpExpectType = 2
+)
+
+var bExpectHeader = []byte("Expect")
+var bExpect100Value = []byte("100-continue")
+
+func (t *TCPMessage) check100Continue() {
+	if t.expectType != httpExpectNotSet || len(t.packets[0].Data) < 25 {
+		return
+	}
+
+	if t.seqMissing || t.headerPacket == -1 {
+		return
+	}
+
+	last := t.packets[len(t.packets)-1]
+	// reading last 4 bytes for double CRLF
+	if !bytes.HasSuffix(last.Data, bEmptyLine) {
+		return
+	}
+
+	var expectB []byte
+	proto.ParseHeaders(t.packetsData(), func(header, value []byte) bool {
+		if proto.HeadersEqual(header, bExpectHeader) {
+			expectB = value
+			return false
+		}
+
+		return true
+	})
+
+	if len(expectB) > 0 && bytes.Equal(bExpect100Value, expectB) {
+		t.expectType = httpExpect100Continue
+		return
+	}
+
+	t.expectType = httpExpectEmpty
+}
+
+func (t *TCPMessage) setAssocMessage(m *TCPMessage) {
+	t.AssocMessage = m
+	t.checkIfComplete()
+}
+
+// UpdateResponseAck should be called after packet is added
+func (t *TCPMessage) UpdateResponseAck() uint32 {
+	lastPacket := t.packets[len(t.packets)-1]
+	if lastPacket.IsFIN && len(t.packets) > 1 {
+		lastPacket = t.packets[len(t.packets)-2]
+	}
+
+	respAck := lastPacket.Seq + uint32(len(lastPacket.Data))
+
+	if t.ResponseAck != respAck {
+		t.ResponseAck = lastPacket.Seq + uint32(len(lastPacket.Data))
+
+		// We swappwed src and dst port
+		copy(t.ResponseID[:16], lastPacket.Addr)
+		copy(t.ResponseID[16:], lastPacket.Raw[2:4]) // Src port
+		copy(t.ResponseID[18:], lastPacket.Raw[0:2]) // Dest port
+		binary.BigEndian.PutUint32(t.ResponseID[20:24], t.ResponseAck)
+	}
+
+	return t.ResponseAck
 }
 
 func (t *TCPMessage) UUID() []byte {
@@ -247,28 +495,18 @@ func (t *TCPMessage) UUID() []byte {
 	return uuid
 }
 
-// UpdateResponseAck should be called after packet is added
-func (t *TCPMessage) UpdateResponseAck() uint32 {
-	lastPacket := t.packets[len(t.packets)-1]
-	respAck := lastPacket.Seq + uint32(len(lastPacket.Data))
-
-	if t.ResponseAck != respAck {
-		t.ResponseAck = lastPacket.Seq + uint32(len(lastPacket.Data))
-
-		// We swappwed src and dst port
-		copy(t.ResponseID[:16], lastPacket.Addr)
-		copy(t.ResponseID[16:], lastPacket.Raw[2:4]) // Src port
-		copy(t.ResponseID[18:], lastPacket.Raw[0:2]) // Dest port
-		binary.BigEndian.PutUint32(t.ResponseID[20:24], t.ResponseAck)
-	}
-
-	return t.ResponseAck
-}
-
 func (t *TCPMessage) ID() tcpID {
 	return t.packets[0].ID
 }
 
 func (t *TCPMessage) IP() net.IP {
 	return net.IP(t.packets[0].Addr)
-}
+}
+
+func (t *TCPMessage) String() string {
+	return strings.Join([]string{
+		"Len packets: " + strconv.Itoa(len(t.packets)),
+		"Data size:" + strconv.Itoa(len(t.Bytes())),
+		"Data:" + string(t.Bytes()),
+	}, "\n")
+}

raw_socket_listener/tcp_message_test.go

@@ -5,9 +5,10 @@ import (
 	"encoding/binary"
 	_ "log"
 	"testing"
+	"time"
 )
 
-func buildPacket(isIncoming bool, Ack, Seq uint32, Data []byte) (packet *TCPPacket) {
+func buildPacket(isIncoming bool, Ack, Seq uint32, Data []byte, timestamp time.Time) (packet *TCPPacket) {
 	var srcPort, destPort uint16
 
 	// For tests `listening` port is 0
@@ -25,7 +26,7 @@ func buildPacket(isIncoming bool, Ack, Seq uint32, Data []byte) (packet *TCPPack
 	buf[12] = 64
 	buf = append(buf, Data...)
 
-	packet = ParseTCPPacket([]byte("123"), buf)
+	packet = ParseTCPPacket([]byte("123"), buf, timestamp)
 
 	return packet
 }
@@ -36,31 +37,31 @@ func buildMessage(p *TCPPacket) *TCPMessage {
 		isIncoming = true
 	}
 
-	m := NewTCPMessage(p.Seq, p.Ack, isIncoming)
+	m := NewTCPMessage(p.Seq, p.Ack, isIncoming, p.timestamp)
 	m.AddPacket(p)
 
 	return m
 }
 
 func TestTCPMessagePacketsOrder(t *testing.T) {
-	msg := buildMessage(buildPacket(true, 1, 1, []byte("a")))
-	msg.AddPacket(buildPacket(true, 1, 2, []byte("b")))
+	msg := buildMessage(buildPacket(true, 1, 1, []byte("a"), time.Now()))
+	msg.AddPacket(buildPacket(true, 1, 2, []byte("b"), time.Now()))
 
 	if !bytes.Equal(msg.Bytes(), []byte("ab")) {
 		t.Error("Should contatenate packets in right order")
 	}
 
 	// When first packet have wrong order (Seq)
-	msg = buildMessage(buildPacket(true, 1, 2, []byte("b")))
-	msg.AddPacket(buildPacket(true, 1, 1, []byte("a")))
+	msg = buildMessage(buildPacket(true, 1, 2, []byte("b"), time.Now()))
+	msg.AddPacket(buildPacket(true, 1, 1, []byte("a"), time.Now()))
 
 	if !bytes.Equal(msg.Bytes(), []byte("ab")) {
 		t.Error("Should contatenate packets in right order")
 	}
 
 	// Should ignore packets with same sequence
-	msg = buildMessage(buildPacket(true, 1, 1, []byte("a")))
-	msg.AddPacket(buildPacket(true, 1, 1, []byte("a")))
+	msg = buildMessage(buildPacket(true, 1, 1, []byte("a"), time.Now()))
+	msg.AddPacket(buildPacket(true, 1, 1, []byte("a"), time.Now()))
 
 	if !bytes.Equal(msg.Bytes(), []byte("a")) {
 		t.Error("Should ignore packet with same Seq")
@@ -68,8 +69,8 @@ func TestTCPMessagePacketsOrder(t *testing.T) {
 }
 
 func TestTCPMessageSize(t *testing.T) {
-	msg := buildMessage(buildPacket(true, 1, 1, []byte("POST / HTTP/1.1\r\nContent-Length: 2\r\n\r\na")))
-	msg.AddPacket(buildPacket(true, 1, 2, []byte("b")))
+	msg := buildMessage(buildPacket(true, 1, 1, []byte("POST / HTTP/1.1\r\nContent-Length: 2\r\n\r\na"), time.Now()))
+	msg.AddPacket(buildPacket(true, 1, 2, []byte("b"), time.Now()))
 
 	if msg.BodySize() != 2 {
 		t.Error("Should count only body", msg.BodySize())
@@ -80,112 +81,178 @@ func TestTCPMessageSize(t *testing.T) {
 	}
 }
 
-func TestTCPMessageIsFinished(t *testing.T) {
-	methodsWithoutBodies := []string{"GET", "OPTIONS", "HEAD"}
+func TestTCPMessageIsComplete(t *testing.T) {
+	testCases := []struct {
+		direction         bool
+		payload           string
+		assocMessage      bool
+		expectedCompleted bool
+	}{
+		{true, "GET / HTTP/1.1\r\n\r\n", false, true},
+		{true, "HEAD / HTTP/1.1\r\n\r\n", false, true},
+		{false, "HTTP/1.1 200 OK\r\n\r\n", true, true},
+		{true, "POST / HTTP/1.1\r\nContent-Length: 1\r\n\r\na", false, true},
+		{true, "PUT / HTTP/1.1\r\nContent-Length: 1\r\n\r\na", false, true},
+		{false, "HTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n", true, true},
+		{false, "HTTP/1.1 200 OK\r\nContent-Length: 1\r\n\r\na", true, true},
+		{false, "HTTP/1.1 200 OK\r\nTransfer-Encoding: chunked\r\n\r\n0\r\n\r\n", true, true},
 
-	for _, m := range methodsWithoutBodies {
-		msg := buildMessage(buildPacket(true, 1, 1, []byte(m+" / HTTP/1.1\r\n\r\n")))
+		// chunked not finished
+		{false, "HTTP/1.1 200 OK\r\nTransfer-Encoding: chunked\r\n\r\n", true, false},
 
-		if !msg.IsFinished() {
-			t.Error(m, " request should be finished")
+		// content-length != actual length
+		{true, "POST / HTTP/1.1\r\nContent-Length: 2\r\n\r\na", false, false},
+		{false, "HTTP/1.1 200 OK\r\nContent-Length: 10\r\n\r\na", true, false},
+		// non-valid http request
+		{true, "UNKNOWN asd HTTP/1.1\r\n\r\n", false, false},
+
+		// response without associated request
+		{false, "HTTP/1.1 200 OK\r\n\r\n", false, false},
+	}
+
+	for _, tc := range testCases {
+		msg := buildMessage(buildPacket(tc.direction, 1, 1, []byte(tc.payload), time.Now()))
+		if tc.assocMessage {
+			msg.AssocMessage = &TCPMessage{}
 		}
-	}
+		msg.checkIfComplete()
 
-	methodsWithBodies := []string{"POST", "PUT", "PATCH"}
-
-	for _, m := range methodsWithBodies {
-		msg := buildMessage(buildPacket(true, 1, 1, []byte(m+" / HTTP/1.1\r\nContent-Length: 1\r\n\r\na")))
-
-		if !msg.IsFinished() {
-			t.Error(m, " should be finished as body length == content length")
+		if msg.complete != tc.expectedCompleted {
+			t.Errorf("Payload %s: Expected %t, got %t.", tc.payload, tc.expectedCompleted, msg.complete)
 		}
-
-		msg = buildMessage(buildPacket(true, 1, 1, []byte(m+" / HTTP/1.1\r\nContent-Length: 2\r\n\r\na")))
-
-		if msg.IsFinished() {
-			t.Error(m, " should not be finished as body length != content length")
-		}
-	}
-
-	msg := buildMessage(buildPacket(true, 1, 1, []byte("UNKNOWN / HTTP/1.1\r\n\r\n")))
-	if msg.IsFinished() {
-		t.Error("non http or wrong methods considered as not finished")
-	}
-
-	// Responses
-	msg = buildMessage(buildPacket(false, 1, 1, []byte("HTTP/1.1 200 OK\r\n\r\n")))
-	msg.AssocMessage = &TCPMessage{}
-	if !msg.IsFinished() {
-		t.Error("Should mark simple response as finished")
-	}
-
-	msg = buildMessage(buildPacket(false, 1, 1, []byte("HTTP/1.1 200 OK\r\n\r\n")))
-	msg.AssocMessage = nil
-	if msg.IsFinished() {
-		t.Error("Should not mark responses without associated requests")
-	}
-
-	msg = buildMessage(buildPacket(false, 1, 1, []byte("HTTP/1.1 200 OK\r\nTransfer-Encoding: chunked\r\n\r\n")))
-	msg.AssocMessage = &TCPMessage{}
-
-	if msg.IsFinished() {
-		t.Error("Should mark chunked response as non finished")
-	}
-
-	msg = buildMessage(buildPacket(false, 1, 1, []byte("HTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n")))
-	msg.AssocMessage = &TCPMessage{}
-
-	if !msg.IsFinished() {
-		t.Error("Should mark Content-Length: 0 respones as finished")
-	}
-
-	msg = buildMessage(buildPacket(false, 1, 1, []byte("HTTP/1.1 200 OK\r\nContent-Length: 1\r\n\r\na")))
-	msg.AssocMessage = &TCPMessage{}
-
-	if !msg.IsFinished() {
-		t.Error("Should mark valid Content-Length respones as finished")
-	}
-
-	msg = buildMessage(buildPacket(false, 1, 1, []byte("HTTP/1.1 200 OK\r\nContent-Length: 10\r\n\r\na")))
-	msg.AssocMessage = &TCPMessage{}
-
-	if msg.IsFinished() {
-		t.Error("Should not mark not valid Content-Length respones as finished")
 	}
 }
 
 func TestTCPMessageIsSeqMissing(t *testing.T) {
-	p1 := buildPacket(false, 1, 1, []byte("HTTP/1.1 200 OK\r\n"))
-	p2 := buildPacket(false, 1, p1.Seq+uint32(len(p1.Data)), []byte("Content-Length: 10\r\n\r\n"))
-	p3 := buildPacket(false, 1, p2.Seq+uint32(len(p2.Data)), []byte("a"))
+	p1 := buildPacket(false, 1, 1, []byte("HTTP/1.1 200 OK\r\n"), time.Now())
+	p2 := buildPacket(false, 1, p1.Seq+uint32(len(p1.Data)), []byte("Content-Length: 10\r\n\r\n"), time.Now())
+	p3 := buildPacket(false, 1, p2.Seq+uint32(len(p2.Data)), []byte("a"), time.Now())
 
 	msg := buildMessage(p1)
-	if msg.isSeqMissing() {
+	if msg.seqMissing {
 		t.Error("Should be complete if have only 1 packet")
 	}
 
 	msg.AddPacket(p3)
-	if !msg.isSeqMissing() {
+	if !msg.seqMissing {
 		t.Error("Should be incomplete because missing middle component")
 	}
 
 	msg.AddPacket(p2)
-	if msg.isSeqMissing() {
+	if msg.seqMissing {
 		t.Error("Should be complete once missing packet added")
 	}
 }
 
 func TestTCPMessageIsHeadersReceived(t *testing.T) {
-	p1 := buildPacket(false, 1, 1, []byte("HTTP/1.1 200 OK\r\n"))
-	p2 := buildPacket(false, 1, p1.Seq+uint32(len(p1.Data)), []byte("Content-Length: 10\r\n\r\n"))
+	p1 := buildPacket(false, 1, 1, []byte("HTTP/1.1 200 OK\r\n\r\n"), time.Now())
+	p2 := buildPacket(false, 1, p1.Seq+uint32(len(p1.Data)), []byte("Content-Length: 10\r\n\r\n"), time.Now())
 
 	msg := buildMessage(p1)
-	if msg.isHeadersReceived() {
-		t.Error("Should be complete if have only 1 packet")
+	if msg.headerPacket == -1 {
+		t.Error("Should be complete if have only 1 packet", msg.headerPacket)
 	}
 
 	msg.AddPacket(p2)
-	if !msg.isHeadersReceived() {
+	if msg.headerPacket == -1 {
 		t.Error("Should found double new line: headers received")
 	}
+
+	msg = buildMessage(buildPacket(true, 1, 1, []byte("GET / HTTP/1.1\r\nContent-Length: 1\r\n"), time.Now()))
+	if msg.headerPacket != -1 {
+		t.Error("Should not find headers end")
+	}
+}
+
+func TestTCPMessageMethodType(t *testing.T) {
+	testCases := []struct {
+		direction          bool
+		payload            string
+		expectedMethodType httpMethodType
+	}{
+		{true, "GET / HTTP/1.1\r\n\r\n", httpMethodKnown},
+		{true, "GET * HTTP/1.1\r\n\r\n", httpMethodKnown},
+		{true, "UNKNOWN / HTTP/1.1\r\n\r\n", httpMethodKnown},
+		{true, "GET http://example.com HTTP/1.1\r\n\r\n", httpMethodKnown},
+		{true, "POST / HTTP/1.1\r\n\r\n", httpMethodKnown},
+		{true, "PUT / HTTP/1.1\r\n\r\n", httpMethodKnown},
+		{true, "GET zxc HTTP/1.1\r\n\r\n", httpMethodNotFound},
+		{true, "GET / HTTP\r\n\r\n", httpMethodNotFound},
+		{true, "VERYLONGMETHOD / HTTP/1.1\r\n\r\n", httpMethodNotFound},
+		{false, "HTTP/1.1 200 OK\r\n\r\n", httpMethodKnown},
+		{false, "HTTP /1.1 200 OK\r\n\r\n", httpMethodNotFound},
+	}
+
+	for _, tc := range testCases {
+		msg := buildMessage(buildPacket(tc.direction, 1, 1, []byte(tc.payload), time.Now()))
+
+		if msg.methodType != tc.expectedMethodType {
+			t.Errorf("Expected %d, got %d", tc.expectedMethodType, msg.methodType)
+		}
+	}
+}
+
+func TestTCPMessageBodyType(t *testing.T) {
+	testCases := []struct {
+		direction        bool
+		payload          string
+		expectedBodyType httpBodyType
+	}{
+		{true, "GET / HTTP/1.1\r\n\r\n", httpBodyEmpty},
+		{true, "GET / HTTP/1.1\r\nContent-Length: 2\r\n\r\nab", httpBodyContentLength},
+		{true, "POST / HTTP/1.1\r\n\r\n", httpBodyEmpty},
+		{true, "POST / HTTP/1.1\r\nUser-Agent: zxc\r\n\r\n", httpBodyEmpty},
+		{false, "HTTP/1.1 200 OK\r\n\r\n", httpBodyEmpty},
+		{true, "POST / HTTP/1.1\r\nContent-Length: 2\r\n\r\nab", httpBodyContentLength},
+		{false, "HTTP/1.1 200 OK\r\nContent-Length: 2\r\n\r\nab", httpBodyContentLength},
+		{true, "POST / HTTP/1.1\r\nTransfer-Encoding: chunked\r\n\r\n2\r\nab\r\n0\r\n\r\n", httpBodyChunked},
+		{false, "HTTP/1.1 200 OK\r\nTransfer-Encoding: chunked\r\n\r\n2\r\nab\r\n0\r\n\r\n", httpBodyChunked},
+	}
+
+	for _, tc := range testCases {
+		msg := buildMessage(buildPacket(tc.direction, 1, 1, []byte(tc.payload), time.Now()))
+
+		if msg.bodyType != tc.expectedBodyType {
+			t.Errorf("Expected %d, got %d", tc.expectedBodyType, msg.bodyType)
+		}
+	}
+}
+
+func TestTCPMessageBodySize(t *testing.T) {
+	testCases := []struct {
+		direction    bool
+		payloads     []string
+		expectedSize int
+	}{
+		{true, []string{"GET / HTTP/1.1\r\n\r\n"}, 0},
+		{true, []string{"POST / HTTP/1.1\r\nContent-Length: 2\r\n\r\nab"}, 2},
+		{true, []string{"GET / HTTP/1.1\r\n", "Content-Length: 2\r\n\r\nab"}, 2},
+		{true, []string{"GET / HTTP/1.1\r\n", "Content-Length: 2\r\n\r\n", "ab"}, 2},
+	}
+
+	for _, tc := range testCases {
+		msg := buildMessage(buildPacket(tc.direction, 1, 1, []byte(tc.payloads[0]), time.Now()))
+
+		if len(tc.payloads) > 1 {
+			for _, p := range tc.payloads[1:] {
+				seq := uint32(1 + msg.Size())
+				msg.AddPacket(buildPacket(tc.direction, 1, seq, []byte(p), time.Now()))
+			}
+		}
+
+		if msg.BodySize() != tc.expectedSize {
+			t.Errorf("Expected %d, got %d", tc.expectedSize, msg.BodySize())
+		}
+	}
+}
+
+func TestTcpMessageStart(t *testing.T) {
+	start := time.Now().Add(-1 * time.Second)
+
+	msg := buildMessage(buildPacket(true, 1, 2, []byte("b"), time.Now()))
+	msg.AddPacket(buildPacket(true, 1, 1, []byte("POST / HTTP/1.1\r\nContent-Length: 2\r\n\r\na"), start))
+
+	if msg.Start != start {
+		t.Error("Message timestamp should be equal to the lowest related packet timestamp", start, msg.Start)
+	}
 }

raw_socket_listener/tcp_packet.go

@@ -5,6 +5,7 @@ import (
 	"log"
 	"strconv"
 	"strings"
+	"time"
 )
 
 var _ = log.Println
@@ -33,18 +34,21 @@ type TCPPacket struct {
 	Ack        uint32
 	OrigAck    uint32
 	DataOffset uint8
+	IsFIN      bool
 
-	Raw  []byte
-	Data []byte
-	Addr []byte
-	ID   tcpID
+	Raw       []byte
+	Data      []byte
+	Addr      []byte
+	timestamp time.Time
+	ID        tcpID
 }
 
 // ParseTCPPacket takes address and tcp payload and returns parsed TCPPacket
-func ParseTCPPacket(addr []byte, data []byte) (p *TCPPacket) {
+func ParseTCPPacket(addr []byte, data []byte, timestamp time.Time) (p *TCPPacket) {
 	p = &TCPPacket{Raw: data}
 	p.ParseBasic()
 	p.Addr = addr
+	p.timestamp = timestamp
 	p.GenID()
 
 	return
@@ -71,28 +75,40 @@ func (t *TCPPacket) ParseBasic() {
 	t.Seq = binary.BigEndian.Uint32(t.Raw[4:8])
 	t.Ack = binary.BigEndian.Uint32(t.Raw[8:12])
 	t.DataOffset = (t.Raw[12] & 0xF0) >> 4
+	t.IsFIN = t.Raw[13]&0x01 != 0
 
-	// log.Println("DataOffset:", t.DataOffset, t.DestPort, t.SrcPort, t.Seq, t.Ack)
-
-	t.Data = t.Raw[t.DataOffset*4:]
+	if len(t.Raw) >= int(t.DataOffset*4) {
+		t.Data = t.Raw[t.DataOffset*4:]
+	}
 }
 
-func (t *TCPPacket) Dump() []byte {
-	buf := make([]byte, len(t.Data)+16+16)
-	copy(buf[:16], t.Addr)
+func (t *TCPPacket) dump() *packet {
 
-	tcpBuf := buf[16:]
+	packetSrcIP := make([]byte, 16)
+	packetData := make([]byte, len(t.Data)+16)
 
-	binary.BigEndian.PutUint16(tcpBuf[2:4], t.DestPort)
-	binary.BigEndian.PutUint16(tcpBuf[0:2], t.SrcPort)
+	copy(packetSrcIP, t.Addr)
 
-	binary.BigEndian.PutUint32(tcpBuf[4:8], t.Seq)
-	binary.BigEndian.PutUint32(tcpBuf[8:12], t.Ack)
+	binary.BigEndian.PutUint16(packetData[0:2], t.SrcPort)
+	binary.BigEndian.PutUint16(packetData[2:4], t.DestPort)
 
-	tcpBuf[12] = 64
-	copy(tcpBuf[16:], t.Data)
+	binary.BigEndian.PutUint32(packetData[4:8], t.Seq)
+	binary.BigEndian.PutUint32(packetData[8:12], t.Ack)
+
+	packetData[12] = 64
+
+	if t.IsFIN {
+		packetData[13] = packetData[13] | 0x01
+	}
+
+	copy(packetData[16:], t.Data)
+
+	return &packet{
+		srcIP:     packetSrcIP,
+		data:      packetData,
+		timestamp: t.timestamp,
+	}
 
-	return buf
 }
 
 // String output for a TCP Packet
@@ -109,6 +125,7 @@ func (t *TCPPacket) String() string {
 		"Sequence:" + strconv.Itoa(int(t.Seq)),
 		"Acknowledgment:" + strconv.Itoa(int(t.Ack)),
 		"Header len:" + strconv.Itoa(int(t.DataOffset)),
+		"FIN:" + strconv.FormatBool(t.IsFIN),
 
 		"Data size:" + strconv.Itoa(len(t.Data)),
 		"Data:" + string(t.Data[:maxLen]),