Revert " Hi, Thank you again Darshit for your response. The RejectHeaderField rule rejects ANY header"

I accidentally commited this patch.

This reverts commit 4ce2f93600827f47f7fea5e7eeb224232cef3c3d.

7 files changed, 0 insertions, 259 deletions

diff --git a/testenv/Makefile.am b/testenv/Makefile.am
index 4b3e2d08..b5a39ad2 100644
--- a/testenv/Makefile.am
+++ b/testenv/Makefile.am
@@ -95,9 +95,6 @@ if HAVE_PYTHON3
     Test-cookie-domain-mismatch.py                  \
     Test-cookie-expires.py                          \
     Test-cookie.py                                  \
-    Test-disable-default-headers.py                 \
-    Test-disable-headers-after.py                   \
-    Test-disable-headers-before.py                  \
     Test-Head.py                                    \
     Test-hsts.py                                    \
     Test--https.py                                  \
diff --git a/testenv/README b/testenv/README
index d2f38a67..6580bc99 100644
--- a/testenv/README
+++ b/testenv/README
@@ -182,10 +182,6 @@ This section lists the currently supported File Rules and their structure.
     * RejectHeader  : This list of Headers must NEVER occur in a request. It
     uses the same value format as ExpectHeader.
 
-    * RejectHeaderField  : This list of Headers Fields must NOT appear in a request.
-    The value for this key is a list of strings where each header field is represented as:
-    |-->Header Field: <Header Field Name>
-
     * SendHeader    : This list of Headers will be sent in EVERY response to a
     request for the respective file. It follows the same value format as
     ExpectHeader. Additionally you can specify a list of strings as <Header Data>
diff --git a/testenv/Test-disable-default-headers.py b/testenv/Test-disable-default-headers.py
deleted file mode 100644
index 4d8ed4db..00000000
--- a/testenv/Test-disable-default-headers.py
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/usr/bin/env python3
-from sys import exit
-from test.http_test import HTTPTest
-from test.base_test import HTTP, HTTPS
-from misc.wget_file import WgetFile
-
-"""
-    This is test ensures that the --disable-header option removes default request
-    headers. There aren't any user defined header.
-"""
-############# File Definitions ###############################################
-file_content = """Les paroles de la bouche d'un homme sont des eaux profondes;
-La source de la sagesse est un torrent qui jaillit."""
-
-Headers = {
-    'Authorization',
-    'User-Agent',
-    'Referer',
-    'Cache-Control',
-    'Pragma',
-    'If-Modified-Since',
-    'Range',
-    'Accept',
-    'Accept-Encoding',
-    'Host',
-    'Connection',
-    'Proxy-Connection',
-    'Content-Type',
-    'Content-Length',
-    'Proxy-Authorization',
-    'Cookie',
-    'MyHeader',
-}
-
-WGET_OPTIONS = '--disable-header="'
-WGET_URLS = [[]]
-Files = [[]]
-headers_len = len(Headers)
-
-for index, header in enumerate(Headers, start=1):
-    File_rules = {
-        "RejectHeaderField"    : {
-            header
-        }
-    }
-    file_name = "File" + str(index)
-    Files[0].append (WgetFile(file_name, file_content, rules=File_rules))
-    WGET_OPTIONS += header  + (',' if index < headers_len else '"')
-    WGET_URLS[0].append (file_name)
-
-Servers = [HTTP]
-
-ExpectedReturnCode = 0
-
-################ Pre and Post Test Hooks #####################################
-pre_test = {
-    "ServerFiles"       : Files
-}
-test_options = {
-    "WgetCommands"      : WGET_OPTIONS,
-    "Urls"              : WGET_URLS
-}
-post_test = {
-    "ExpectedRetcode"   : ExpectedReturnCode
-}
-
-err = HTTPTest (
-                pre_hook=pre_test,
-                test_params=test_options,
-                post_hook=post_test,
-                protocols=Servers
-).begin ()
-
-exit (err)
diff --git a/testenv/Test-disable-headers-after.py b/testenv/Test-disable-headers-after.py
deleted file mode 100644
index 344301a3..00000000
--- a/testenv/Test-disable-headers-after.py
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/usr/bin/env python3
-from sys import exit
-from test.http_test import HTTPTest
-from test.base_test import HTTP, HTTPS
-from misc.wget_file import WgetFile
-
-"""
-    This is test ensures that the --disable-header option removes user headers
-    from the HTTP request when it's placed after --header="header: value".
-"""
-############# File Definitions ###############################################
-file_content = """Les paroles de la bouche d'un homme sont des eaux profondes;
-La source de la sagesse est un torrent qui jaillit."""
-
-Headers = {
-    'Authorization',
-    'User-Agent',
-    'Referer',
-    'Cache-Control',
-    'Pragma',
-    'If-Modified-Since',
-    'Range',
-    'Accept',
-    'Accept-Encoding',
-    'Host',
-    'Connection',
-    'Proxy-Connection',
-    'Content-Type',
-    'Content-Length',
-    'Proxy-Authorization',
-    'Cookie',
-    'MyHeader',
-}
-
-WGET_OPTIONS = ''
-WGET_URLS = [[]]
-Files = [[]]
-
-# Define user defined headers
-for header in Headers:
-    WGET_OPTIONS += ' --header="' + header + ': any"'
-
-WGET_OPTIONS += ' --disable-header="'
-headers_len = len(Headers)
-
-for index, header in enumerate(Headers, start=1):
-    File_rules = {
-        "RejectHeader"    : {
-            header : 'any'
-        }
-    }
-    file_name = "File" + str(index)
-    Files[0].append(WgetFile(file_name, file_content, rules=File_rules))
-    WGET_OPTIONS += header  + (',' if index < headers_len else '"')
-    WGET_URLS[0].append(file_name)
-
-Servers = [HTTP]
-
-ExpectedReturnCode = 0
-
-################ Pre and Post Test Hooks #####################################
-pre_test = {
-    "ServerFiles"       : Files
-}
-test_options = {
-    "WgetCommands"      : WGET_OPTIONS,
-    "Urls"              : WGET_URLS
-}
-post_test = {
-    "ExpectedRetcode"   : ExpectedReturnCode
-}
-
-err = HTTPTest (
-                pre_hook=pre_test,
-                test_params=test_options,
-                post_hook=post_test,
-                protocols=Servers
-).begin ()
-
-exit (err)
diff --git a/testenv/Test-disable-headers-before.py b/testenv/Test-disable-headers-before.py
deleted file mode 100644
index bc19fda9..00000000
--- a/testenv/Test-disable-headers-before.py
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/usr/bin/env python3
-from sys import exit
-from test.http_test import HTTPTest
-from test.base_test import HTTP, HTTPS
-from misc.wget_file import WgetFile
-
-"""
-    This is test ensures that the --disable-header option doesn't remove user headers
-    from the HTTP request when it's placed before --header="header: value".
-"""
-############# File Definitions ###############################################
-file_content = """Les paroles de la bouche d'un homme sont des eaux profondes;
-La source de la sagesse est un torrent qui jaillit."""
-
-Headers = {
-    'Authorization',
-    'User-Agent',
-    'Referer',
-    'Cache-Control',
-    'Pragma',
-    'If-Modified-Since',
-    'Range',
-    'Accept',
-    'Accept-Encoding',
-    'Host',
-    'Connection',
-    'Proxy-Connection',
-    'Content-Type',
-    'Content-Length',
-    'Proxy-Authorization',
-    'Cookie',
-    'MyHeader',
-}
-
-WGET_OPTIONS = '--disable-header="'
-WGET_URLS = [[]]
-Files = [[]]
-headers_len = len(Headers)
-
-for index, header in enumerate(Headers, start=1):
-    File_rules = {
-        "ExpectHeader"    : {
-            header : 'any'
-        }
-    }
-    file_name = "File" + str(index)
-    Files[0].append (WgetFile(file_name, file_content, rules=File_rules))
-    WGET_OPTIONS += header  + (',' if index < headers_len else '"')
-    WGET_URLS[0].append (file_name)
-
-# Define user defined headers
-for header in Headers:
-    WGET_OPTIONS += ' --header="' + header + ': any"'
-
-Servers = [HTTP]
-
-ExpectedReturnCode = 0
-
-################ Pre and Post Test Hooks #####################################
-pre_test = {
-    "ServerFiles"       : Files
-}
-test_options = {
-    "WgetCommands"      : WGET_OPTIONS,
-    "Urls"              : WGET_URLS
-}
-post_test = {
-    "ExpectedRetcode"   : ExpectedReturnCode
-}
-
-err = HTTPTest (
-                pre_hook=pre_test,
-                test_params=test_options,
-                post_hook=post_test,
-                protocols=Servers
-).begin ()
-
-exit (err)
diff --git a/testenv/conf/reject_header_field.py b/testenv/conf/reject_header_field.py
deleted file mode 100644
index e1009cdd..00000000
--- a/testenv/conf/reject_header_field.py
+++ /dev/null
@@ -1,12 +0,0 @@
-from conf import rule
-
-""" Rule: RejectHeaderField
-This is a server side rule which expects a string list of Header Fields
-which should be blacklisted by the server for a particular file's requests.
-"""
-
-
-@rule()
-class RejectHeaderField:
-    def __init__(self, header_fields):
-        self.header_fields = header_fields
diff --git a/testenv/server/http/http_server.py b/testenv/server/http/http_server.py
index 6f358335..2cc82fb9 100644
--- a/testenv/server/http/http_server.py
+++ b/testenv/server/http/http_server.py
@@ -370,14 +370,6 @@ class _Handler(BaseHTTPRequestHandler):
                                 header_line)
                 raise ServerError("Header " + header_line + ' received')
 
-    def RejectHeaderField(self, header_fields_obj):
-        rej_header_fields = header_fields_obj.header_fields
-        for field in rej_header_fields:
-            if field in self.headers:
-                self.send_error(400, 'Blacklisted Header Field %s received' %
-                                field)
-                raise ServerError('Header Field %s received' % field)
-
     def __log_request(self, method):
         req = method + " " + self.path
         self.server.request_headers.append(req)