Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 0 additions & 6 deletions .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -291,12 +291,6 @@ jobs:
cd docker
docker compose -f <(envsubst < docker-compose.yml) -f <(envsubst < ${{ matrix.demo_name }}.yml) -p ${PROJECT} stop

- name: Login to Docker Hub
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKER_HUB_USERNAME }}
password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}

Comment on lines -294 to -299
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removing this is necessary, because otherwise forks can not have the CI run on them and this was just a testing as well.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense 👍

- name: Integration Test ${{ matrix.test }}-${{ matrix.flavor_id }}
run: |
cd docker
Expand Down
13 changes: 7 additions & 6 deletions core-primitives/attestation-handler/src/attestation_handler.rs
Original file line number Diff line number Diff line change
Expand Up @@ -356,17 +356,18 @@ where

fn log_resp_code(&self, resp_code: &mut Option<u16>) {
let msg = match resp_code {
Some(200) => "OK Operation Successful",
Some(401) => "Unauthorized Failed to authenticate or authorize request.",
Some(404) => "Not Found GID does not refer to a valid EPID group ID.",
Some(500) => "Internal error occurred",
Some(200) => "OK, operation successful",
Some(400) => "Bad request, quote is invalid, or linkability of quote/subscription does not match.",
Some(401) => "Unauthorized, failed to authenticate or authorize request.",
Some(404) => "Not found, GID does not refer to a valid EPID group ID.",
Some(500) => "Internal error occurred.",
Some(503) =>
"Service is currently not able to process the request (due to
a temporary overloading or maintenance). This is a
temporary state – the same request can be repeated after
some time. ",
some time.",
_ => {
error!("DBG:{:?}", resp_code);
error!("Error, received unknown HTTP response: {:?}", resp_code);
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🥳

"Unknown error occured"
},
};
Expand Down
13 changes: 8 additions & 5 deletions service/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -759,14 +759,17 @@ fn register_collateral(
is_development_mode: bool,
skip_ra: bool,
) {
//TODO generate_dcap_ra_quote() does not really need skip_ra, rethink how many layers skip_ra should be passed along
let dcap_quote = enclave.generate_dcap_ra_quote(skip_ra).unwrap();
let (fmspc, _tcb_info) = extract_tcb_info_from_raw_dcap_quote(&dcap_quote).unwrap();
if !skip_ra {
let (fmspc, _tcb_info) = extract_tcb_info_from_raw_dcap_quote(&dcap_quote).unwrap();

let xt = enclave.generate_register_quoting_enclave_extrinsic(fmspc).unwrap();
send_extrinsic(xt, api, accountid, is_development_mode);
let uxt = enclave.generate_register_quoting_enclave_extrinsic(fmspc).unwrap();
send_extrinsic(&uxt, api, accountid, is_development_mode);

let xt = enclave.generate_register_tcb_info_extrinsic(fmspc).unwrap();
send_extrinsic(xt, api, accountid, is_development_mode);
let uxt = enclave.generate_register_tcb_info_extrinsic(fmspc).unwrap();
send_extrinsic(&uxt, api, accountid, is_development_mode);
}
}

fn send_extrinsic(
Expand Down