diff --git a/doc/ostree.repo-config.xml b/doc/ostree.repo-config.xml index 621879c9..bbacdd08 100644 --- a/doc/ostree.repo-config.xml +++ b/doc/ostree.repo-config.xml @@ -152,6 +152,11 @@ Boston, MA 02111-1307, USA. tls-client-key-path Path to file containing client-side certificate key, to present when making requests to this repository. + + + tls-ca-path + Path to file containing trusted anchors instead of the system CA database. + diff --git a/src/libostree/ostree-fetcher.c b/src/libostree/ostree-fetcher.c index 6172a91f..b6dc761f 100644 --- a/src/libostree/ostree-fetcher.c +++ b/src/libostree/ostree-fetcher.c @@ -233,6 +233,16 @@ _ostree_fetcher_set_client_cert (OstreeFetcher *fetcher, } } +void +_ostree_fetcher_set_tls_database (OstreeFetcher *self, + GTlsDatabase *db) +{ + if (db) + g_object_set ((GObject*)self->session, "tls-database", db, NULL); + else + g_object_set ((GObject*)self->session, "ssl-use-system-ca-file", TRUE, NULL); +} + static void on_request_sent (GObject *object, GAsyncResult *result, gpointer user_data); diff --git a/src/libostree/ostree-fetcher.h b/src/libostree/ostree-fetcher.h index 0288392f..850d3178 100644 --- a/src/libostree/ostree-fetcher.h +++ b/src/libostree/ostree-fetcher.h @@ -57,6 +57,9 @@ OstreeFetcher *_ostree_fetcher_new (GFile *tmpdir, void _ostree_fetcher_set_client_cert (OstreeFetcher *fetcher, GTlsCertificate *cert); +void _ostree_fetcher_set_tls_database (OstreeFetcher *self, + GTlsDatabase *db); + char * _ostree_fetcher_query_state_text (OstreeFetcher *self); guint64 _ostree_fetcher_bytes_transferred (OstreeFetcher *self); diff --git a/src/libostree/ostree-repo-pull.c b/src/libostree/ostree-repo-pull.c index 837e5561..7d3ad262 100644 --- a/src/libostree/ostree-repo-pull.c +++ b/src/libostree/ostree-repo-pull.c @@ -1129,6 +1129,22 @@ ostree_repo_pull (OstreeRepo *self, } } + { + gs_free char *tls_ca_path = NULL; + gs_unref_object GTlsDatabase *db = NULL; + + if (!ot_keyfile_get_value_with_default (config, remote_key, + "tls-ca-path", + NULL, &tls_ca_path, error)) + goto out; + + db = g_tls_file_database_new (tls_ca_path, error); + if (!db) + goto out; + + _ostree_fetcher_set_tls_database (pull_data->fetcher, db); + } + if (!pull_data->base_uri) { g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,