Skip to content

pccsadmin: don't require API token for 'cache' & 'fetch' commands #431

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

pccsadmin: don't require API token for 'cache' & 'fetch' commands #431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions tools/PccsAdminTool/lib/intelsgx/pcs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,13 +333,13 @@ def strerror(self):
# PCS: Get PCK Certificate(s)
#----------------------------------------------------------------------------

def get_pck_cert(self, eppid, pceid, cpusvn, pcesvn, dec=None):
def get_pck_cert(self, eppid, pceid, cpusvn, pcesvn, dec=None, anonymous=False):
self.clear_errors()
url= self._geturl('pckcert')
url+= "?encrypted_ppid={:s}&pceid={:s}&cpusvn={:s}&pcesvn={:s}".format(
eppid, pceid, cpusvn, pcesvn)

response= self._get_request(url, True)
response= self._get_request(url, not anonymous)
if response.status_code != 200:
print(str(response.content, 'utf-8'))
if response.status_code == 401:
Expand Down Expand Up @@ -401,7 +401,7 @@ def get_cpusvn_from_tcb(self, tcb):
"%0.2X" % tcb['sgxtcbcomp15svn'] +
"%0.2X" % tcb['sgxtcbcomp16svn'])

def get_pck_certs(self, eppid, pceid, platform_manifest, dec=None):
def get_pck_certs(self, eppid, pceid, platform_manifest, dec=None, anonymous=False):
self.clear_errors()
certs_pem= []
url= self._geturl('pckcerts')
Expand All @@ -410,10 +410,10 @@ def get_pck_certs(self, eppid, pceid, platform_manifest, dec=None):
data = {}
data["pceid"] = pceid
data["platformManifest"] = platform_manifest
response= self._post_request(url, data, True)
response= self._post_request(url, data, not anonymous)
else:
url+= "?encrypted_ppid={:s}&pceid={:s}".format(eppid, pceid)
response= self._get_request(url, True)
response= self._get_request(url, not anonymous)

if response.status_code != 200:
print(str(response.content, 'utf-8'))
Expand Down
14 changes: 10 additions & 4 deletions tools/PccsAdminTool/pccsadmin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ def main():
parser_fetch.add_argument("-p", "--platform", help="Specify what kind of platform you want to fetch FMSPCs and tcbinfos for; default: all", choices=['all','client','E3','E5'])
parser_fetch.add_argument("-t", "--tcb_update_type", help="Type of update to TCB info and enclave identities; default: standard", choices=['standard','early','all'])
parser_fetch.add_argument("-c", "--crl", help="Retrieve only the certificate revocation list (CRL). If an input file is provided, this option will be ignored.", action="store_true")
parser_fetch.add_argument("-a", "--anonymous", help="Don't provide API authentication token to PCS service", action="store_true")
parser_fetch.set_defaults(func=pcs_fetch)

# subparser for collect
Expand All @@ -84,6 +85,7 @@ def main():
parser_cache.add_argument("-s", "--sub_dir", help="Store output cache files in subdirectories named according to QE ID or Platform ID", action="store_true")
parser_cache.add_argument("-e", "--expire", type=Utils.check_expire_hours, help="How many hours the cache files will be valid for. Default is 2160 hours (90 days).")
parser_cache.add_argument("-t", "--tcb_update_type", help="Type of update to TCB info and enclave identities; default: standard", choices=['standard','early'])
parser_cache.add_argument("-a", "--anonymous", help="Don't provide API authentication token to PCS service", action="store_true")
parser_cache.set_defaults(func=pcs_cache)

args = parser.parse_args()
Expand Down Expand Up @@ -318,7 +320,7 @@ def __init__(self, credentials, args):
self.tcb_update_type = args.tcb_update_type or 'standard'
self.crl_only = bool(args.crl and not args.input_file)
self.apikey = ""
if not self.crl_only:
if not self.crl_only and not args.anonymous:
self.apikey = self.credentials.get_pcs_api_key()
self.pcsclient = PCS(self.url, self.ApiVersion, self.apikey)
self.sgxext = SgxPckCertificateExtensions()
Expand Down Expand Up @@ -412,7 +414,8 @@ def _fetch_pck_certs(self):
pce_id = platform_id[1]

# get pckcerts from Intel PCS, return value is [certs, certs_not_available, chain, fmspc]
pckcerts = self.pcsclient.get_pck_certs(enc_ppid, pce_id, platform_manifest, 'ascii')
pckcerts = self.pcsclient.get_pck_certs(enc_ppid, pce_id, platform_manifest, 'ascii',
anonymous=self.args.anonymous)
if pckcerts == None:
print("Failed to get PCK certs for platform enc_ppid:%s, pce_id:%s" %(enc_ppid,pce_id))
return False
Expand Down Expand Up @@ -580,7 +583,8 @@ def write_to_cache_file(self, platform, output_dir, expire_hours, tcbcomponent,
print(f"{output_file} saved successfully.")

def create_platform_cache_file(self, platform, pcsclient, output_dir, expire_hours):
pckcerts = pcsclient.get_pck_certs(platform["enc_ppid"], platform["pce_id"], platform["platform_manifest"], 'ascii')
pckcerts = pcsclient.get_pck_certs(platform["enc_ppid"], platform["pce_id"], platform["platform_manifest"], 'ascii',
anonymous=self.args.anonymous)

if pckcerts is None:
print(f"Failed to get PCK certs for platform enc_ppid: {platform['enc_ppid']}, pce_id: {platform['pce_id']}")
Expand Down Expand Up @@ -618,7 +622,9 @@ def generate_cache(self):
input_fullpath = os.path.join(os.getcwd(), input_file)

# Get PCS ApiKey from keyring
apikey = self.credentials.get_pcs_api_key()
apikey = None
if not self.args.anonymous:
apikey = self.credentials.get_pcs_api_key()

# Initialize PCS object
pcsclient = PCS(url, ApiVersion, apikey)
Expand Down