Skip to content

Commit

Permalink
uppercase https headers
Browse files Browse the repository at this point in the history
  • Loading branch information
orsinium committed Oct 7, 2019
1 parent af86854 commit dd3c911
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
8 changes: 4 additions & 4 deletions opentaxii/taxii/http.py
Expand Up @@ -31,7 +31,7 @@
HTTP_CONTENT_TYPE, HTTP_X_TAXII_CONTENT_TYPE,
HTTP_X_TAXII_PROTOCOL, HTTP_X_TAXII_SERVICES)

TAXII_11_HTTPS_Headers = {
TAXII_11_HTTPS_HEADERS = {
HTTP_CONTENT_TYPE: HTTP_CONTENT_XML,
HTTP_X_TAXII_CONTENT_TYPE: VID_TAXII_XML_11,
HTTP_X_TAXII_PROTOCOL: VID_TAXII_HTTPS_10,
Expand All @@ -45,7 +45,7 @@
HTTP_X_TAXII_SERVICES: VID_TAXII_SERVICES_11
}

TAXII_10_HTTPS_Headers = {
TAXII_10_HTTPS_HEADERS = {
HTTP_CONTENT_TYPE: HTTP_CONTENT_XML,
HTTP_X_TAXII_CONTENT_TYPE: VID_TAXII_XML_10,
HTTP_X_TAXII_PROTOCOL: VID_TAXII_HTTPS_10,
Expand All @@ -69,13 +69,13 @@ def get_http_headers(version, is_secure):
taxii_11 = [VID_TAXII_XML_11, VID_TAXII_SERVICES_11]
if version in taxii_11:
if is_secure:
return TAXII_11_HTTPS_Headers
return TAXII_11_HTTPS_HEADERS
return TAXII_11_HTTP_HEADERS

taxii_10 = [VID_TAXII_XML_10, VID_TAXII_SERVICES_10]
if version in taxii_10:
if is_secure:
return TAXII_10_HTTPS_Headers
return TAXII_10_HTTPS_HEADERS
return TAXII_10_HTTP_HEADERS

# FIXME: should raise a custom error
Expand Down
10 changes: 5 additions & 5 deletions tests/utils.py
Expand Up @@ -3,7 +3,7 @@

from opentaxii.taxii import entities
from opentaxii.taxii.http import (
TAXII_10_HTTPS_Headers, TAXII_10_HTTP_HEADERS, TAXII_11_HTTPS_Headers,
TAXII_10_HTTPS_HEADERS, TAXII_10_HTTP_HEADERS, TAXII_11_HTTPS_HEADERS,
TAXII_11_HTTP_HEADERS
)
from opentaxii.taxii.http import (
Expand All @@ -28,12 +28,12 @@ def prepare_headers(version, https):
headers = dict()
if version == 10:
if https:
headers.update(TAXII_10_HTTPS_Headers)
headers.update(TAXII_10_HTTPS_HEADERS)
else:
headers.update(TAXII_10_HTTP_HEADERS)
elif version == 11:
if https:
headers.update(TAXII_11_HTTPS_Headers)
headers.update(TAXII_11_HTTPS_HEADERS)
else:
headers.update(TAXII_11_HTTP_HEADERS)
else:
Expand Down Expand Up @@ -99,12 +99,12 @@ def includes(superset, subset):
def is_headers_valid(headers, version, https):
if version == 10:
if https:
return includes(headers, TAXII_10_HTTPS_Headers)
return includes(headers, TAXII_10_HTTPS_HEADERS)
else:
return includes(headers, TAXII_10_HTTP_HEADERS)
elif version == 11:
if https:
return includes(headers, TAXII_11_HTTPS_Headers)
return includes(headers, TAXII_11_HTTPS_HEADERS)
else:
return includes(headers, TAXII_11_HTTP_HEADERS)
else:
Expand Down

0 comments on commit dd3c911

Please sign in to comment.