Deprecate Embedded Certs (prebid#4625)

Author: SyntaxNode

config/config.go

@@ -79,8 +79,6 @@ type Configuration struct {
 	AccountDefaults Account `mapstructure:"account_defaults"`
 	// accountDefaultsJSON is the internal serialized form of AccountDefaults used for json merge
 	accountDefaultsJSON json.RawMessage
-	// CertsUseSystem will use the host OS certificates instead of embedded certs.
-	CertsUseSystem bool `mapstructure:"certificates_use_system"`
 	// Local private file containing SSL certificates
 	PemCertsFile string `mapstructure:"certificates_file"`
 	// Custom headers to handle request timeouts from queueing infrastructure
@@ -1253,7 +1251,6 @@ func SetupViper(v *viper.Viper, filename string, bidderInfos BidderInfos) {
 	v.SetDefault("compression.response.enable_gzip", false)
 	v.SetDefault("compression.request.enable_gzip", false)
 
-	v.SetDefault("certificates_use_system", false)
 	v.SetDefault("certificates_file", "")
 
 	v.SetDefault("auto_gen_source_tid", true)

config/config_test.go

@@ -600,7 +600,6 @@ analytics:
     - code: agma-code
       publisher_id: publisher-id
       site_app_id: site-or-app-id
-certificates_use_system: true
 `)
 
 func cmpStrings(t *testing.T, key, expected, actual string) {
@@ -949,7 +948,6 @@ func TestFullConfig(t *testing.T) {
 	cmpStrings(t, "analytics.agma.accounts.0.publisher_id", "publisher-id", cfg.Analytics.Agma.Accounts[0].PublisherId)
 	cmpStrings(t, "analytics.agma.accounts.0.code", "agma-code", cfg.Analytics.Agma.Accounts[0].Code)
 	cmpStrings(t, "analytics.agma.accounts.0.site_app_id", "site-or-app-id", cfg.Analytics.Agma.Accounts[0].SiteAppId)
-	cmpBools(t, "certificates_use_system", true, cfg.CertsUseSystem)
 }
 
 func TestValidateConfig(t *testing.T) {

router/router.go

@@ -128,15 +128,14 @@ func New(cfg *config.Configuration, rateConvertor *currency.RateConverter) (r *R
 		Router: httprouter.New(),
 	}
 
-	// For bid processing, we need both the hardcoded certificates and the certificates found in container's
-	// local file system
-	certPool, certPoolCreateErr := ssl.CreateCertPool(cfg.CertsUseSystem)
+	certPool, certPoolCreateErr := ssl.CreateCertPool()
 	if certPoolCreateErr != nil {
 		logger.Infof("Could not load root certificates: %s \n", certPoolCreateErr.Error())
 	}
 
+	// load optional PEM certificate files
 	var readCertErr error
-	certPool, readCertErr = ssl.AppendPEMFileToRootCAPool(certPool, cfg.PemCertsFile)
+	certPool, readCertErr = ssl.AppendPEMFileToCertPool(certPool, cfg.PemCertsFile)
 	if readCertErr != nil {
 		logger.Infof("Could not read certificates file: %s \n", readCertErr.Error())
 	}