{"action":"created","comment":{"url":"https://api.github.com/repos/vespa-engine/vespa/pulls/comments/216945908","pull_request_review_id":154543102,"id":216945908,"node_id":"MDI0OlB1bGxSZXF1ZXN0UmV2aWV3Q29tbWVudDIxNjk0NTkwOA==","diff_hunk":"@@ -58,20 +62,61 @@ public SslContextFactory getInstance(String containerId, int port) {\n                 .toArray(String[]::new);\n         factory.setExcludeCipherSuites(excludedCiphersWithoutTlsRsaExclusion);\n \n-        setStringArrayParameter(\n-                factory, sslConfig.excludeProtocol(), ConnectorConfig.Ssl.ExcludeProtocol::name, SslContextFactory::setExcludeProtocols);\n-        setStringArrayParameter(\n-                factory, sslConfig.includeProtocol(), ConnectorConfig.Ssl.IncludeProtocol::name, SslContextFactory::setIncludeProtocols);\n-        setStringArrayParameter(\n-                factory, sslConfig.excludeCipherSuite(), ConnectorConfig.Ssl.ExcludeCipherSuite::name, SslContextFactory::setExcludeCipherSuites);\n-        setStringArrayParameter(\n-                factory, sslConfig.includeCipherSuite(), ConnectorConfig.Ssl.IncludeCipherSuite::name, SslContextFactory::setIncludeCipherSuites);\n-\n-        factory.setKeyManagerFactoryAlgorithm(sslConfig.sslKeyManagerFactoryAlgorithm());\n-        factory.setProtocol(sslConfig.protocol());\n+        // Check if using new ssl syntax from services.xml\n+        if (!sslConfig.privateKeyFile().isEmpty()) {\n+            factory.setKeyStore(createKeystore(sslConfig));\n+            if (!sslConfig.caCertificateFile().isEmpty()) {\n+                factory.setTrustStore(createTruststore(sslConfig));\n+            }\n+            factory.setProtocol(\"TLS\");\n+        } else {\n+            // TODO Remove SslKeyStoreConfigurator / SslTrustStoreConfigurator\n+            sslKeyStoreConfigurator.configure(new DefaultSslKeyStoreContext(factory));\n+            sslTrustStoreConfigurator.configure(new DefaultSslTrustStoreContext(factory));\n+\n+            // TODO Remove support for deprecated ssl connector config","path":"jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/DefaultSslContextFactoryProvider.java","position":77,"original_position":68,"commit_id":"406d2ad3f8bded9ab7a6363c050bba4a8a888a22","original_commit_id":"8ae271b20348a478bad8597d6b800bad1ec5f82d","user":{"login":"bjorncs","id":798335,"node_id":"MDQ6VXNlcjc5ODMzNQ==","avatar_url":"https://avatars3.githubusercontent.com/u/798335?v=4","gravatar_id":"","url":"https://api.github.com/users/bjorncs","html_url":"https://github.com/bjorncs","followers_url":"https://api.github.com/users/bjorncs/followers","following_url":"https://api.github.com/users/bjorncs/following{/other_user}","gists_url":"https://api.github.com/users/bjorncs/gists{/gist_id}","starred_url":"https://api.github.com/users/bjorncs/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/bjorncs/subscriptions","organizations_url":"https://api.github.com/users/bjorncs/orgs","repos_url":"https://api.github.com/users/bjorncs/repos","events_url":"https://api.github.com/users/bjorncs/events{/privacy}","received_events_url":"https://api.github.com/users/bjorncs/received_events","type":"User","site_admin":false},"body":"TODO later this sprint. This was never a public api :)","created_at":"2018-09-12T08:47:34Z","updated_at":"2018-09-12T08:47:35Z","html_url":"https://github.com/vespa-engine/vespa/pull/6848#discussion_r216945908","pull_request_url":"https://api.github.com/repos/vespa-engine/vespa/pulls/6848","author_association":"MEMBER","_links":{"self":{"href":"https://api.github.com/repos/vespa-engine/vespa/pulls/comments/216945908"},"html":{"href":"https://github.com/vespa-engine/vespa/pull/6848#discussion_r216945908"},"pull_request":{"href":"https://api.github.com/repos/vespa-engine/vespa/pulls/6848"}},"in_reply_to_id":216945636},"pull_request":{"url":"https://api.github.com/repos/vespa-engine/vespa/pulls/6848","id":213892272,"node_id":"MDExOlB1bGxSZXF1ZXN0MjEzODkyMjcy","html_url":"https://github.com/vespa-engine/vespa/pull/6848","diff_url":"https://github.com/vespa-engine/vespa/pull/6848.diff","patch_url":"https://github.com/vespa-engine/vespa/pull/6848.patch","issue_url":"https://api.github.com/repos/vespa-engine/vespa/issues/6848","number":6848,"state":"open","locked":false,"title":"Add XML syntax for configuring SSL","user":{"login":"tokle","id":701372,"node_id":"MDQ6VXNlcjcwMTM3Mg==","avatar_url":"https://avatars1.githubusercontent.com/u/701372?v=4","gravatar_id":"","url":"https://api.github.com/users/tokle","html_url":"https://github.com/tokle","followers_url":"https://api.github.com/users/tokle/followers","following_url":"https://api.github.com/users/tokle/following{/other_user}","gists_url":"https://api.github.com/users/tokle/gists{/gist_id}","starred_url":"https://api.github.com/users/tokle/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/tokle/subscriptions","organizations_url":"https://api.github.com/users/tokle/orgs","repos_url":"https://api.github.com/users/tokle/repos","events_url":"https://api.github.com/users/tokle/events{/privacy}","received_events_url":"https://api.github.com/users/tokle/received_events","type":"User","site_admin":false},"body":"","created_at":"2018-09-07T10:59:16Z","updated_at":"2018-09-12T08:47:35Z","closed_at":null,"merged_at":null,"merge_commit_sha":"ae8eeefcaf60dddb552c09bf52ace6704941ee74","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"commits_url":"https://api.github.com/repos/vespa-engine/vespa/pulls/6848/commits","review_comments_url":"https://api.github.com/repos/vespa-engine/vespa/pulls/6848/comments","review_comment_url":"https://api.github.com/repos/vespa-engine/vespa/pulls/comments{/number}","comments_url":"https://api.github.com/repos/vespa-engine/vespa/issues/6848/comments","statuses_url":"https://api.github.com/repos/vespa-engine/vespa/statuses/406d2ad3f8bded9ab7a6363c050bba4a8a888a22","head":{"label":"vespa-engine:mortent/ssl-config","ref":"mortent/ssl-config","sha":"406d2ad3f8bded9ab7a6363c050bba4a8a888a22","user":{"login":"vespa-engine","id":29299694,"node_id":"MDEyOk9yZ2FuaXphdGlvbjI5Mjk5Njk0","avatar_url":"https://avatars1.githubusercontent.com/u/29299694?v=4","gravatar_id":"","url":"https://api.github.com/users/vespa-engine","html_url":"https://github.com/vespa-engine","followers_url":"https://api.github.com/users/vespa-engine/followers","following_url":"https://api.github.com/users/vespa-engine/following{/other_user}","gists_url":"https://api.github.com/users/vespa-engine/gists{/gist_id}","starred_url":"https://api.github.com/users/vespa-engine/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/vespa-engine/subscriptions","organizations_url":"https://api.github.com/users/vespa-engine/orgs","repos_url":"https://api.github.com/users/vespa-engine/repos","events_url":"https://api.github.com/users/vespa-engine/events{/privacy}","received_events_url":"https://api.github.com/users/vespa-engine/received_events","type":"Organization","site_admin":false},"repo":{"id":60377070,"node_id":"MDEwOlJlcG9zaXRvcnk2MDM3NzA3MA==","name":"vespa","full_name":"vespa-engine/vespa","owner":{"login":"vespa-engine","id":29299694,"node_id":"MDEyOk9yZ2FuaXphdGlvbjI5Mjk5Njk0","avatar_url":"https://avatars1.githubusercontent.com/u/29299694?v=4","gravatar_id":"","url":"https://api.github.com/users/vespa-engine","html_url":"https://github.com/vespa-engine","followers_url":"https://api.github.com/users/vespa-engine/followers","following_url":"https://api.github.com/users/vespa-engine/following{/other_user}","gists_url":"https://api.github.com/users/vespa-engine/gists{/gist_id}","starred_url":"https://api.github.com/users/vespa-engine/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/vespa-engine/subscriptions","organizations_url":"https://api.github.com/users/vespa-engine/orgs","repos_url":"https://api.github.com/users/vespa-engine/repos","events_url":"https://api.github.com/users/vespa-engine/events{/privacy}","received_events_url":"https://api.github.com/users/vespa-engine/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/vespa-engine/vespa","description":"Vespa - the open big data serving engine","fork":false,"url":"https://api.github.com/repos/vespa-engine/vespa","forks_url":"https://api.github.com/repos/vespa-engine/vespa/forks","keys_url":"https://api.github.com/repos/vespa-engine/vespa/keys{/key_id}","collaborators_url":"https://api.github.com/repos/vespa-engine/vespa/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/vespa-engine/vespa/teams","hooks_url":"https://api.github.com/repos/vespa-engine/vespa/hooks","issue_events_url":"https://api.github.com/repos/vespa-engine/vespa/issues/events{/number}","events_url":"https://api.github.com/repos/vespa-engine/vespa/events","assignees_url":"https://api.github.com/repos/vespa-engine/vespa/assignees{/user}","branches_url":"https://api.github.com/repos/vespa-engine/vespa/branches{/branch}","tags_url":"https://api.github.com/repos/vespa-engine/vespa/tags","blobs_url":"https://api.github.com/repos/vespa-engine/vespa/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/vespa-engine/vespa/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/vespa-engine/vespa/git/refs{/sha}","trees_url":"https://api.github.com/repos/vespa-engine/vespa/git/trees{/sha}","statuses_url":"https://api.github.com/repos/vespa-engine/vespa/statuses/{sha}","languages_url":"https://api.github.com/repos/vespa-engine/vespa/languages","stargazers_url":"https://api.github.com/repos/vespa-engine/vespa/stargazers","contributors_url":"https://api.github.com/repos/vespa-engine/vespa/contributors","subscribers_url":"https://api.github.com/repos/vespa-engine/vespa/subscribers","subscription_url":"https://api.github.com/repos/vespa-engine/vespa/subscription","commits_url":"https://api.github.com/repos/vespa-engine/vespa/commits{/sha}","git_commits_url":"https://api.github.com/repos/vespa-engine/vespa/git/commits{/sha}","comments_url":"https://api.github.com/repos/vespa-engine/vespa/comments{/number}","issue_comment_url":"https://api.github.com/repos/vespa-engine/vespa/issues/comments{/number}","contents_url":"https://api.github.com/repos/vespa-engine/vespa/contents/{+path}","compare_url":"https://api.github.com/repos/vespa-engine/vespa/compare/{base}...{head}","merges_url":"https://api.github.com/repos/vespa-engine/vespa/merges","archive_url":"https://api.github.com/repos/vespa-engine/vespa/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/vespa-engine/vespa/downloads","issues_url":"https://api.github.com/repos/vespa-engine/vespa/issues{/number}","pulls_url":"https://api.github.com/repos/vespa-engine/vespa/pulls{/number}","milestones_url":"https://api.github.com/repos/vespa-engine/vespa/milestones{/number}","notifications_url":"https://api.github.com/repos/vespa-engine/vespa/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/vespa-engine/vespa/labels{/name}","releases_url":"https://api.github.com/repos/vespa-engine/vespa/releases{/id}","deployments_url":"https://api.github.com/repos/vespa-engine/vespa/deployments","created_at":"2016-06-03T20:54:20Z","updated_at":"2018-09-12T07:46:45Z","pushed_at":"2018-09-12T07:46:42Z","git_url":"git://github.com/vespa-engine/vespa.git","ssh_url":"git@github.com:vespa-engine/vespa.git","clone_url":"https://github.com/vespa-engine/vespa.git","svn_url":"https://github.com/vespa-engine/vespa","homepage":"http://vespa.ai/","size":76574,"stargazers_count":2595,"watchers_count":2595,"language":"Java","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":306,"mirror_url":null,"archived":false,"open_issues_count":64,"license":{"key":"apache-2.0","name":"Apache License 2.0","spdx_id":"Apache-2.0","url":"https://api.github.com/licenses/apache-2.0","node_id":"MDc6TGljZW5zZTI="},"forks":306,"open_issues":64,"watchers":2595,"default_branch":"master"}},"base":{"label":"vespa-engine:master","ref":"master","sha":"6abeddec87a58f4d116e9cff5bfc7350a7e12485","user":{"login":"vespa-engine","id":29299694,"node_id":"MDEyOk9yZ2FuaXphdGlvbjI5Mjk5Njk0","avatar_url":"https://avatars1.githubusercontent.com/u/29299694?v=4","gravatar_id":"","url":"https://api.github.com/users/vespa-engine","html_url":"https://github.com/vespa-engine","followers_url":"https://api.github.com/users/vespa-engine/followers","following_url":"https://api.github.com/users/vespa-engine/following{/other_user}","gists_url":"https://api.github.com/users/vespa-engine/gists{/gist_id}","starred_url":"https://api.github.com/users/vespa-engine/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/vespa-engine/subscriptions","organizations_url":"https://api.github.com/users/vespa-engine/orgs","repos_url":"https://api.github.com/users/vespa-engine/repos","events_url":"https://api.github.com/users/vespa-engine/events{/privacy}","received_events_url":"https://api.github.com/users/vespa-engine/received_events","type":"Organization","site_admin":false},"repo":{"id":60377070,"node_id":"MDEwOlJlcG9zaXRvcnk2MDM3NzA3MA==","name":"vespa","full_name":"vespa-engine/vespa","owner":{"login":"vespa-engine","id":29299694,"node_id":"MDEyOk9yZ2FuaXphdGlvbjI5Mjk5Njk0","avatar_url":"https://avatars1.githubusercontent.com/u/29299694?v=4","gravatar_id":"","url":"https://api.github.com/users/vespa-engine","html_url":"https://github.com/vespa-engine","followers_url":"https://api.github.com/users/vespa-engine/followers","following_url":"https://api.github.com/users/vespa-engine/following{/other_user}","gists_url":"https://api.github.com/users/vespa-engine/gists{/gist_id}","starred_url":"https://api.github.com/users/vespa-engine/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/vespa-engine/subscriptions","organizations_url":"https://api.github.com/users/vespa-engine/orgs","repos_url":"https://api.github.com/users/vespa-engine/repos","events_url":"https://api.github.com/users/vespa-engine/events{/privacy}","received_events_url":"https://api.github.com/users/vespa-engine/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/vespa-engine/vespa","description":"Vespa - the open big data serving engine","fork":false,"url":"https://api.github.com/repos/vespa-engine/vespa","forks_url":"https://api.github.com/repos/vespa-engine/vespa/forks","keys_url":"https://api.github.com/repos/vespa-engine/vespa/keys{/key_id}","collaborators_url":"https://api.github.com/repos/vespa-engine/vespa/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/vespa-engine/vespa/teams","hooks_url":"https://api.github.com/repos/vespa-engine/vespa/hooks","issue_events_url":"https://api.github.com/repos/vespa-engine/vespa/issues/events{/number}","events_url":"https://api.github.com/repos/vespa-engine/vespa/events","assignees_url":"https://api.github.com/repos/vespa-engine/vespa/assignees{/user}","branches_url":"https://api.github.com/repos/vespa-engine/vespa/branches{/branch}","tags_url":"https://api.github.com/repos/vespa-engine/vespa/tags","blobs_url":"https://api.github.com/repos/vespa-engine/vespa/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/vespa-engine/vespa/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/vespa-engine/vespa/git/refs{/sha}","trees_url":"https://api.github.com/repos/vespa-engine/vespa/git/trees{/sha}","statuses_url":"https://api.github.com/repos/vespa-engine/vespa/statuses/{sha}","languages_url":"https://api.github.com/repos/vespa-engine/vespa/languages","stargazers_url":"https://api.github.com/repos/vespa-engine/vespa/stargazers","contributors_url":"https://api.github.com/repos/vespa-engine/vespa/contributors","subscribers_url":"https://api.github.com/repos/vespa-engine/vespa/subscribers","subscription_url":"https://api.github.com/repos/vespa-engine/vespa/subscription","commits_url":"https://api.github.com/repos/vespa-engine/vespa/commits{/sha}","git_commits_url":"https://api.github.com/repos/vespa-engine/vespa/git/commits{/sha}","comments_url":"https://api.github.com/repos/vespa-engine/vespa/comments{/number}","issue_comment_url":"https://api.github.com/repos/vespa-engine/vespa/issues/comments{/number}","contents_url":"https://api.github.com/repos/vespa-engine/vespa/contents/{+path}","compare_url":"https://api.github.com/repos/vespa-engine/vespa/compare/{base}...{head}","merges_url":"https://api.github.com/repos/vespa-engine/vespa/merges","archive_url":"https://api.github.com/repos/vespa-engine/vespa/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/vespa-engine/vespa/downloads","issues_url":"https://api.github.com/repos/vespa-engine/vespa/issues{/number}","pulls_url":"https://api.github.com/repos/vespa-engine/vespa/pulls{/number}","milestones_url":"https://api.github.com/repos/vespa-engine/vespa/milestones{/number}","notifications_url":"https://api.github.com/repos/vespa-engine/vespa/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/vespa-engine/vespa/labels{/name}","releases_url":"https://api.github.com/repos/vespa-engine/vespa/releases{/id}","deployments_url":"https://api.github.com/repos/vespa-engine/vespa/deployments","created_at":"2016-06-03T20:54:20Z","updated_at":"2018-09-12T07:46:45Z","pushed_at":"2018-09-12T07:46:42Z","git_url":"git://github.com/vespa-engine/vespa.git","ssh_url":"git@github.com:vespa-engine/vespa.git","clone_url":"https://github.com/vespa-engine/vespa.git","svn_url":"https://github.com/vespa-engine/vespa","homepage":"http://vespa.ai/","size":76574,"stargazers_count":2595,"watchers_count":2595,"language":"Java","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":306,"mirror_url":null,"archived":false,"open_issues_count":64,"license":{"key":"apache-2.0","name":"Apache License 2.0","spdx_id":"Apache-2.0","url":"https://api.github.com/licenses/apache-2.0","node_id":"MDc6TGljZW5zZTI="},"forks":306,"open_issues":64,"watchers":2595,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/vespa-engine/vespa/pulls/6848"},"html":{"href":"https://github.com/vespa-engine/vespa/pull/6848"},"issue":{"href":"https://api.github.com/repos/vespa-engine/vespa/issues/6848"},"comments":{"href":"https://api.github.com/repos/vespa-engine/vespa/issues/6848/comments"},"review_comments":{"href":"https://api.github.com/repos/vespa-engine/vespa/pulls/6848/comments"},"review_comment":{"href":"https://api.github.com/repos/vespa-engine/vespa/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/vespa-engine/vespa/pulls/6848/commits"},"statuses":{"href":"https://api.github.com/repos/vespa-engine/vespa/statuses/406d2ad3f8bded9ab7a6363c050bba4a8a888a22"}},"author_association":"CONTRIBUTOR"}}
{"actor":{"display_login":"bjorncs"}}