Skip to content

Unit Test - Increase openssl's key size. Place test certs into a comon test folder #7451

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
randall merged 1 commit into from
Feb 7, 2021
Merged

Unit Test - Increase openssl's key size. Place test certs into a comon test folder #7451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions tests/gold_tests/autest-site/trafficserver.test.ext
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,10 @@ def MakeATSProcess(obj, name, command='traffic_server', select_ports=True,
p.Env['PROXY_CONFIG_SSL_DIR'] = ssl_dir
p.Variables.SSLDir = ssl_dir
AddMethodToInstance(p, addSSLfile)

# Add default cert folder & register handy method.
AddMethodToInstance(p, addDefaultSSLFiles)
AddMethodToInstance(p, addSSLFileFromDefaultTestFolder)
########################################################
# cache.db directory
p.Setup.MakeDir(storage_dir)
Expand Down Expand Up @@ -461,6 +465,15 @@ def addSSLfile(self, filename):
self.Setup.CopyAs(filename, self.Variables.SSLDir)


def addDefaultSSLFiles(self):
addSSLfile(self, os.path.join(self.Variables.AtsTestToolsDir, "ssl", "server.pem"))
addSSLfile(self, os.path.join(self.Variables.AtsTestToolsDir, "ssl", "server.key"))


def addSSLFileFromDefaultTestFolder(self, filename):
addSSLfile(self, os.path.join(self.Variables.AtsTestToolsDir, "ssl", filename))


RegisterFileType(Config, "ats:config")
RegisterFileType(RecordsConfig, "ats:config:records")
ExtendTest(MakeATSProcess, name="MakeATSProcess")
3 changes: 1 addition & 2 deletions tests/gold_tests/bigobj/bigobj.test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@

ts = Test.MakeATSProcess("ts", enable_tls=True)

ts.addSSLfile("ssl/server.pem")
ts.addSSLfile("ssl/server.key")
ts.addDefaultSSLFiles()

ts.Disk.records_config.update({
'proxy.config.diags.debug.enabled': 1,
Expand Down
15 changes: 0 additions & 15 deletions tests/gold_tests/bigobj/ssl/server.key
View file
Open in desktop

This file was deleted.

32 changes: 0 additions & 32 deletions tests/gold_tests/bigobj/ssl/server.pem
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions tests/gold_tests/chunked_encoding/chunked_encoding.test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,7 @@
server3.addResponse("sessionlog.json", request_header3, response_header3)

# add ssl materials like key, certificates for the server
ts.addSSLfile("ssl/server.pem")
ts.addSSLfile("ssl/server.key")
ts.addDefaultSSLFiles()

ts.Disk.records_config.update({
'proxy.config.diags.debug.enabled': 1,
Expand Down
3 changes: 1 addition & 2 deletions tests/gold_tests/chunked_encoding/chunked_encoding_h2.test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@
ts = Test.MakeATSProcess("ts", select_ports=True, enable_tls=True)

# add ssl materials like key, certificates for the server
ts.addSSLfile("ssl/server.pem")
ts.addSSLfile("ssl/server.key")
ts.addDefaultSSLFiles()

ts.Disk.records_config.update({
'proxy.config.http2.enabled': 1, # this option is for VZM-internal only
Expand Down
15 changes: 0 additions & 15 deletions tests/gold_tests/chunked_encoding/ssl/server.key
View file
Open in desktop

This file was deleted.

32 changes: 0 additions & 32 deletions tests/gold_tests/chunked_encoding/ssl/server.pem
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions tests/gold_tests/continuations/double_h2.test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,7 @@
server.addResponse("sessionfile.log", request_header, response_header)

# add ssl materials like key, certificates for the server
ts.addSSLfile("ssl/server.pem")
ts.addSSLfile("ssl/server.key")
ts.addDefaultSSLFiles()

# add port and remap rule
ts.Disk.remap_config.AddLine(
Expand Down
3 changes: 1 addition & 2 deletions tests/gold_tests/continuations/openclose_h2.test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,7 @@
"timestamp": "1469733493.993", "body": ""}

# add ssl materials like key, certificates for the server
ts.addSSLfile("ssl/server.pem")
ts.addSSLfile("ssl/server.key")
ts.addDefaultSSLFiles()

Test.PrepareTestPlugin(os.path.join(Test.Variables.AtsTestPluginsDir,
'ssntxnorder_verify.so'), ts)
Expand Down
3 changes: 1 addition & 2 deletions tests/gold_tests/continuations/session_id.test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,7 @@
# Configure ATS. Disable the cache to simplify the test.
ts = Test.MakeATSProcess("ts", command="traffic_manager", enable_tls=True, enable_cache=False)

ts.addSSLfile("ssl/server.pem")
ts.addSSLfile("ssl/server.key")
ts.addDefaultSSLFiles()

Test.PrepareTestPlugin(os.path.join(Test.Variables.AtsBuildGoldTestsDir,
'continuations', 'plugins', '.libs', 'session_id_verify.so'), ts)
Expand Down
15 changes: 0 additions & 15 deletions tests/gold_tests/continuations/ssl/server.key
View file
Open in desktop

This file was deleted.

32 changes: 0 additions & 32 deletions tests/gold_tests/continuations/ssl/server.pem
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions tests/gold_tests/h2/h2disable.test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,7 @@
server.addResponse("sessionlog.json", request_header, response_header)

# add ssl materials like key, certificates for the server
ts.addSSLfile("ssl/server.pem")
ts.addSSLfile("ssl/server.key")
ts.addDefaultSSLFiles()

ts.Disk.remap_config.AddLine(
'map / http://127.0.0.1:{0}'.format(server.Variables.Port))
Expand Down
3 changes: 1 addition & 2 deletions tests/gold_tests/h2/h2disable_no_accept_threads.test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,7 @@
server.addResponse("sessionlog.json", request_header, response_header)

# add ssl materials like key, certificates for the server
ts.addSSLfile("ssl/server.pem")
ts.addSSLfile("ssl/server.key")
ts.addDefaultSSLFiles()

ts.Disk.remap_config.AddLine(
'map / http://127.0.0.1:{0}'.format(server.Variables.Port))
Expand Down
3 changes: 1 addition & 2 deletions tests/gold_tests/h2/h2enable.test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,7 @@
server.addResponse("sessionlog.json", request_header, response_header)

# add ssl materials like key, certificates for the server
ts.addSSLfile("ssl/server.pem")
ts.addSSLfile("ssl/server.key")
ts.addDefaultSSLFiles()

ts.Disk.remap_config.AddLine(
'map / http://127.0.0.1:{0}'.format(server.Variables.Port))
Expand Down
3 changes: 1 addition & 2 deletions tests/gold_tests/h2/h2enable_no_accept_threads.test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,7 @@
server.addResponse("sessionlog.json", request_header, response_header)

# add ssl materials like key, certificates for the server
ts.addSSLfile("ssl/server.pem")
ts.addSSLfile("ssl/server.key")
ts.addDefaultSSLFiles()

ts.Disk.remap_config.AddLine(
'map / http://127.0.0.1:{0}'.format(server.Variables.Port))
Expand Down
3 changes: 1 addition & 2 deletions tests/gold_tests/h2/h2spec.test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,7 @@
ts = Test.MakeATSProcess("ts", enable_tls=True, enable_cache=False)

# add ssl materials like key, certificates for the server
ts.addSSLfile("ssl/server.pem")
ts.addSSLfile("ssl/server.key")
ts.addDefaultSSLFiles()

ts.Disk.remap_config.AddLine(
'map / http://127.0.0.1:{0}'.format(httpbin.Variables.Port)
Expand Down
3 changes: 1 addition & 2 deletions tests/gold_tests/h2/http2.test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,7 @@
ts = Test.MakeATSProcess("ts", select_ports=True, enable_tls=True, enable_cache=False)

# add ssl materials like key, certificates for the server
ts.addSSLfile("ssl/server.pem")
ts.addSSLfile("ssl/server.key")
ts.addDefaultSSLFiles()

ts.Setup.CopyAs('rules/huge_resp_hdrs.conf', Test.RunDirectory)
ts.Disk.remap_config.AddLine(
Expand Down
3 changes: 1 addition & 2 deletions tests/gold_tests/h2/http2_priority.test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,7 @@
# ----
ts = Test.MakeATSProcess("ts", select_ports=True, enable_tls=True, enable_cache=False)

ts.addSSLfile("ssl/server.pem")
ts.addSSLfile("ssl/server.key")
ts.addDefaultSSLFiles()

ts.Disk.remap_config.AddLine(
'map / http://127.0.0.1:{0}'.format(server.Variables.Port)
Expand Down
3 changes: 1 addition & 2 deletions tests/gold_tests/h2/httpbin.test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,7 @@
ts = Test.MakeATSProcess("ts", select_ports=True, enable_tls=True, enable_cache=False)

# add ssl materials like key, certificates for the server
ts.addSSLfile("ssl/server.pem")
ts.addSSLfile("ssl/server.key")
ts.addDefaultSSLFiles()

ts.Disk.remap_config.AddLine(
'map / http://127.0.0.1:{0}'.format(httpbin.Variables.Port)
Expand Down
3 changes: 1 addition & 2 deletions tests/gold_tests/h2/nghttp.test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,7 @@
enable_tls=True, enable_cache=False)

# add ssl materials like key, certificates for the server
ts.addSSLfile("ssl/server.pem")
ts.addSSLfile("ssl/server.key")
ts.addDefaultSSLFiles()

ts.Setup.CopyAs('rules/graceful_shutdown.conf', Test.RunDirectory)

Expand Down
15 changes: 0 additions & 15 deletions tests/gold_tests/h2/ssl/server.key
View file
Open in desktop

This file was deleted.

32 changes: 0 additions & 32 deletions tests/gold_tests/h2/ssl/server.pem
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions tests/gold_tests/headers/forwarded.test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,7 @@

def baselineTsSetup(ts):

ts.addSSLfile("../remap/ssl/server.pem")
ts.addSSLfile("../remap/ssl/server.key")
ts.addDefaultSSLFiles()

ts.Disk.records_config.update({
# 'proxy.config.diags.debug.enabled': 1,
Expand Down
3 changes: 1 addition & 2 deletions tests/gold_tests/headers/hsts.test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@
server.addResponse("sessionlog.json", request_header, response_header)

# ATS Configuration
ts.addSSLfile("../remap/ssl/server.pem")
ts.addSSLfile("../remap/ssl/server.key")
ts.addDefaultSSLFiles()

ts.Disk.records_config.update({
'proxy.config.diags.debug.enabled': 1,
Expand Down
Loading