diff options
| author | Fu Siyuan <siyuan.fu@intel.com> | 2016-03-17 09:27:07 +0800 |
|---|---|---|
| committer | Fu Siyuan <siyuan.fu@intel.com> | 2016-03-24 10:09:47 +0800 |
| commit | a5acc84226183fc5a5d55eb923f6c47a8d42d861 (patch) | |
| tree | fb36b608d7fd9554bf499cfa7d34aa45da504626 /NetworkPkg/HttpBootDxe/HttpBootConfig.c | |
| parent | 9e41f686fc20304086db387563089e42cf3189d5 (diff) | |
| download | edk2-a5acc84226183fc5a5d55eb923f6c47a8d42d861.tar.gz edk2-a5acc84226183fc5a5d55eb923f6c47a8d42d861.tar.bz2 edk2-a5acc84226183fc5a5d55eb923f6c47a8d42d861.zip | |
NetworkPkg: Fix HII related problem in HTTP boot driver.
According to UEFI spec, HII_Config_Access.RouteConfig() should return success
if the required configuration has been processed. Current HTTP boot driver
may return error code in some situation, which failed the UEFI SCT test.
This patch fix this issue by removing the returned error status code and adding
extra check point in the Callback() function, which will pop up a message box
if user input an unsupported URI string.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Fu Siyuan <siyuan.fu@intel.com>
Reviewed-by: Dong Eric <eric.dong@intel.com>
Reviewed-by: Wu Jiaxin <jiaxin.wu@intel.com>
Diffstat (limited to 'NetworkPkg/HttpBootDxe/HttpBootConfig.c')
| -rw-r--r-- | NetworkPkg/HttpBootDxe/HttpBootConfig.c | 77 |
1 files changed, 68 insertions, 9 deletions
diff --git a/NetworkPkg/HttpBootDxe/HttpBootConfig.c b/NetworkPkg/HttpBootDxe/HttpBootConfig.c index 0c1ff43d5c..e7dd5db4db 100644 --- a/NetworkPkg/HttpBootDxe/HttpBootConfig.c +++ b/NetworkPkg/HttpBootDxe/HttpBootConfig.c @@ -351,6 +351,7 @@ HttpBootFormExtractConfig ( //
BufferSize = sizeof (HTTP_BOOT_CONFIG_IFR_NVDATA);
ZeroMem (&CallbackInfo->HttpBootNvData, BufferSize);
+ StrCpyS (CallbackInfo->HttpBootNvData.Description, DESCRIPTION_STR_MAX_SIZE / sizeof (CHAR16), HTTP_BOOT_DEFAULT_DESCRIPTION_STR);
ConfigRequest = Request;
if ((Request == NULL) || (StrStr (Request, L"OFFSET") == NULL)) {
@@ -376,7 +377,6 @@ HttpBootFormExtractConfig ( Results,
Progress
);
- ASSERT_EFI_ERROR (Status);
//
// Free the allocated config request string.
@@ -487,14 +487,14 @@ HttpBootFormRouteConfig ( //
// Create a new boot option according to the configuration data.
//
- Status = HttpBootAddBootOption (
- Private,
- (CallbackInfo->HttpBootNvData.IpVersion == HTTP_BOOT_IP_VERSION_6) ? TRUE : FALSE,
- CallbackInfo->HttpBootNvData.Description,
- CallbackInfo->HttpBootNvData.Uri
- );
+ HttpBootAddBootOption (
+ Private,
+ (CallbackInfo->HttpBootNvData.IpVersion == HTTP_BOOT_IP_VERSION_6) ? TRUE : FALSE,
+ CallbackInfo->HttpBootNvData.Description,
+ CallbackInfo->HttpBootNvData.Uri
+ );
- return Status;
+ return EFI_SUCCESS;
}
/**
@@ -533,7 +533,66 @@ HttpBootFormCallback ( OUT EFI_BROWSER_ACTION_REQUEST *ActionRequest
)
{
- return EFI_UNSUPPORTED;
+ EFI_INPUT_KEY Key;
+ UINTN Index;
+ CHAR16 *Uri;
+ HTTP_BOOT_FORM_CALLBACK_INFO *CallbackInfo;
+
+ if (This == NULL || Value == NULL) {
+ return EFI_INVALID_PARAMETER;
+ }
+
+ CallbackInfo = HTTP_BOOT_FORM_CALLBACK_INFO_FROM_CONFIG_ACCESS (This);
+
+ if (Action != EFI_BROWSER_ACTION_CHANGING) {
+ return EFI_UNSUPPORTED;
+ }
+
+ switch (QuestionId) {
+ case KEY_INITIATOR_URI:
+ //
+ // Get user input URI string
+ //
+ Uri = HiiGetString (CallbackInfo->RegisteredHandle, Value->string, NULL);
+
+ //
+ // Convert the scheme to all lower case.
+ //
+ for (Index = 0; Index < StrLen (Uri); Index++) {
+ if (Uri[Index] == L':') {
+ break;
+ }
+ if (Uri[Index] >= L'A' && Uri[Index] <= L'Z') {
+ Uri[Index] -= (CHAR16)(L'A' - L'a');
+ }
+ }
+
+ //
+ // Set the converted URI string back
+ //
+ HiiSetString (CallbackInfo->RegisteredHandle, Value->string, Uri, NULL);
+
+ //
+ // We only accept http and https, pop up a message box for unsupported URI.
+ //
+ if ((StrnCmp (Uri, L"http://", 7) != 0) && (StrnCmp (Uri, L"https://", 7) != 0)) {
+ CreatePopUp (
+ EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,
+ &Key,
+ L"ERROR: Unsupported URI!",
+ L"Only supports HTTP and HTTPS",
+ NULL
+ );
+ }
+
+ FreePool (Uri);
+ break;
+
+ default:
+ break;
+ }
+
+ return EFI_SUCCESS;
}
/**
|