microsoft
/
CCF
зеркало из https://github.com/microsoft/CCF.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Remove `/[app|gov|node]/code` endpoints (#6657)

This commit is contained in:
Eddy Ashton 2024-11-18 13:20:51 +00:00 коммит произвёл GitHub
Родитель 5c2df39e11
Коммит f1aed3e16a
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: B5690EEEBB952194
7 изменённых файлов: 6 добавлений и 214 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

66
doc/schemas/app_openapi.json
Просмотреть файл

@ -31,44 +31,6 @@
},
"type": "object"
},
"CodeStatus": {
"enum": [
"AllowedToJoin"
],
"type": "string"
},
"GetCode__Out": {
"properties": {
"versions": {
"$ref": "#/components/schemas/GetCode__Version_array"
}
},
"required": [
"versions"
],
"type": "object"
},
"GetCode__Version": {
"properties": {
"digest": {
"$ref": "#/components/schemas/string"
},
"status": {
"$ref": "#/components/schemas/CodeStatus"
}
},
"required": [
"digest",
"status"
],
"type": "object"
},
"GetCode__Version_array": {
"items": {
"$ref": "#/components/schemas/GetCode__Version"
},
"type": "array"
},
"GetCommit__Out": {
"properties": {
"transaction_id": {
@ -295,7 +257,7 @@
"info": {
"description": "This CCF sample app implements a simple logging application, securely recording messages at client-specified IDs. It demonstrates most of the features available to CCF apps.",
"title": "CCF Sample Logging App",
"version": "2.6.0"
"version": "2.7.0"
},
"openapi": "3.0.0",
"paths": {
@ -323,32 +285,6 @@
}
}
},
"/app/code": {
"get": {
"deprecated": true,
"description": "This endpoint is deprecated from 5.0.0. It is replaced by GET /gov/service/join-policy",
"operationId": "GetAppCode",
"responses": {
"200": {
"content": {
"application/json": {
"schema": {
"$ref": "#/components/schemas/GetCode__Out"
}
}
},
"description": "Default response description"
},
"default": {
"$ref": "#/components/responses/default"
}
},
"summary": "Permitted SGX code identities",
"x-ccf-forwarding": {
"$ref": "#/components/x-ccf-forwarding/sometimes"
}
}
},
"/app/commit": {
"get": {
"description": "Latest transaction ID that has been committed on the service",

60
doc/schemas/gov_openapi.json
Просмотреть файл

@ -190,38 +190,6 @@
],
"type": "object"
},
"GetCode__Out": {
"properties": {
"versions": {
"$ref": "#/components/schemas/GetCode__Version_array"
}
},
"required": [
"versions"
],
"type": "object"
},
"GetCode__Version": {
"properties": {
"digest": {
"$ref": "#/components/schemas/string"
},
"status": {
"$ref": "#/components/schemas/CodeStatus"
}
},
"required": [
"digest",
"status"
],
"type": "object"
},
"GetCode__Version_array": {
"items": {
"$ref": "#/components/schemas/GetCode__Version"
},
"type": "array"
},
"GetCommit__Out": {
"properties": {
"transaction_id": {
@ -1333,7 +1301,7 @@
"info": {
"description": "This API is used to submit and query proposals which affect CCF's public governance tables.",
"title": "CCF Governance API",
"version": "4.4.0"
"version": "4.5.0"
},
"openapi": "3.0.0",
"paths": {
@ -1426,32 +1394,6 @@
}
}
},
"/gov/code": {
"get": {
"deprecated": true,
"description": "This endpoint is deprecated from 5.0.0. It is replaced by GET /gov/service/join-policy",
"operationId": "GetGovCode",
"responses": {
"200": {
"content": {
"application/json": {
"schema": {
"$ref": "#/components/schemas/GetCode__Out"
}
}
},
"description": "Default response description"
},
"default": {
"$ref": "#/components/responses/default"
}
},
"summary": "Permitted SGX code identities",
"x-ccf-forwarding": {
"$ref": "#/components/x-ccf-forwarding/sometimes"
}
}
},
"/gov/commit": {
"get": {
"description": "Latest transaction ID that has been committed on the service",

66
doc/schemas/node_openapi.json
Просмотреть файл

@ -40,12 +40,6 @@
},
"type": "object"
},
"CodeStatus": {
"enum": [
"AllowedToJoin"
],
"type": "string"
},
"Configuration": {
"properties": {
"idx": {
@ -183,38 +177,6 @@
],
"type": "object"
},
"GetCode__Out": {
"properties": {
"versions": {
"$ref": "#/components/schemas/GetCode__Version_array"
}
},
"required": [
"versions"
],
"type": "object"
},
"GetCode__Version": {
"properties": {
"digest": {
"$ref": "#/components/schemas/string"
},
"status": {
"$ref": "#/components/schemas/CodeStatus"
}
},
"required": [
"digest",
"status"
],
"type": "object"
},
"GetCode__Version_array": {
"items": {
"$ref": "#/components/schemas/GetCode__Version"
},
"type": "array"
},
"GetCommit__Out": {
"properties": {
"transaction_id": {
@ -896,7 +858,7 @@
"info": {
"description": "This API provides public, uncredentialed access to service and node state.",
"title": "CCF Public Node API",
"version": "4.10.3"
"version": "4.11.0"
},
"openapi": "3.0.0",
"paths": {
@ -940,32 +902,6 @@
}
}
},
"/node/code": {
"get": {
"deprecated": true,
"description": "This endpoint is deprecated from 5.0.0. It is replaced by GET /gov/service/join-policy",
"operationId": "GetNodeCode",
"responses": {
"200": {
"content": {
"application/json": {
"schema": {
"$ref": "#/components/schemas/GetCode__Out"
}
}
},
"description": "Default response description"
},
"default": {
"$ref": "#/components/responses/default"
}
},
"summary": "Permitted SGX code identities",
"x-ccf-forwarding": {
"$ref": "#/components/x-ccf-forwarding/sometimes"
}
}
},
"/node/commit": {
"get": {
"description": "Latest transaction ID that has been committed on the service",

2
samples/apps/logging/logging.cpp
Просмотреть файл

@ -470,7 +470,7 @@ namespace loggingapp
"recording messages at client-specified IDs. It demonstrates most of "
"the features available to CCF apps.";
openapi_info.document_version = "2.6.0";
openapi_info.document_version = "2.7.0";
index_per_public_key = std::make_shared<RecordsIndexingStrategy>(
PUBLIC_RECORDS, context, 10000, 20);

22
src/endpoints/common_endpoint_registry.cpp
Просмотреть файл

@ -246,28 +246,6 @@ namespace ccf
"Invalid.")
.install();
auto get_code = [](auto& ctx, nlohmann::json&&) {
GetCode::Out out;
auto codes_ids = ctx.tx.template ro<CodeIDs>(Tables::NODE_CODE_IDS);
codes_ids->foreach(
[&out](
const ccf::pal::SgxAttestationMeasurement& measurement,
const ccf::CodeStatus& status) {
auto digest = measurement.hex_str();
out.versions.push_back({digest, status});
return true;
});
return make_success(out);
};
make_read_only_endpoint(
"/code", HTTP_GET, json_read_only_adapter(get_code), no_auth_required)
.set_auto_schema<void, GetCode::Out>()
.set_openapi_summary("Permitted SGX code identities")
.set_openapi_deprecated_replaced("5.0.0", "GET /gov/service/join-policy")
.install();
auto openapi = [this](auto& ctx) { this->api_endpoint(ctx); };
make_read_only_endpoint("/api", HTTP_GET, openapi, no_auth_required)
.set_auto_schema<void, GetAPI::Out>()

2
src/node/rpc/member_frontend.h
Просмотреть файл

@ -599,7 +599,7 @@ namespace ccf
openapi_info.description =
"This API is used to submit and query proposals which affect CCF's "
"public governance tables.";
openapi_info.document_version = "4.4.0";
openapi_info.document_version = "4.5.0";
}
static std::optional<MemberId> get_caller_member_id(

2
src/node/rpc/node_frontend.h
Просмотреть файл

@ -404,7 +404,7 @@ namespace ccf
openapi_info.description =
"This API provides public, uncredentialed access to service and node "
"state.";
openapi_info.document_version = "4.10.3";
openapi_info.document_version = "4.11.0";
}
void init_handlers() override