Changeset 243087 in webkit


Ignore:
Timestamp:
Mar 18, 2019, 11:47:43 AM (6 years ago)
Author:
Joseph Pecoraro
Message:

Web Inspector: HAR Extension for serverIPAddress port number
​https://bugs.webkit.org/show_bug.cgi?id=195695

Reviewed by Matt Baker.

Source/WebInspectorUI:

  • UserInterface/Controllers/HARBuilder.js:

(WI.HARBuilder.entry):
(WI.HARBuilder.port):

  • UserInterface/Models/LocalResource.js:

(WI.LocalResource.fromHAREntry):

LayoutTests:

  • http/tests/inspector/network/har/har-basic-expected.txt:
  • http/tests/inspector/network/har/har-page-expected.txt:
Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r243084 r243087  
     12019-03-18  Joseph Pecoraro  <pecoraro@apple.com>
     2
     3        Web Inspector: HAR Extension for `serverIPAddress` port number
     4        https://bugs.webkit.org/show_bug.cgi?id=195695
     5
     6        Reviewed by Matt Baker.
     7
     8        * http/tests/inspector/network/har/har-basic-expected.txt:
     9        * http/tests/inspector/network/har/har-page-expected.txt:
     10
    1112019-03-18  Joseph Pecoraro  <pecoraro@apple.com>
    212

  • trunk/LayoutTests/http/tests/inspector/network/har/har-basic-expected.txt

    r243031 r243087  
    136136        },
    137137        "serverIPAddress": "12.34.56.78",
     138        "_serverPort": 443,
    138139        "connection": "1",
    139140        "_fetchType": "Network Load",

  • trunk/LayoutTests/http/tests/inspector/network/har/har-page-expected.txt

    r243031 r243087  
    6363          "receive": "<filtered>"
    6464        },
     65        "_serverPort": 8000,
    6566        "_priority": "high"
    6667      },
    … …  
    105106          "receive": "<filtered>"
    106107        },
     108        "_serverPort": 8000,
    107109        "_priority": "high"
    108110      },
    … …  
    147149          "receive": "<filtered>"
    148150        },
     151        "_serverPort": 8000,
    149152        "_priority": "high"
    150153      },
    … …  
    196199          "receive": "<filtered>"
    197200        },
     201        "_serverPort": 8000,
    198202        "_priority": "medium"
    199203      },
    … …  
    251255          "receive": "<filtered>"
    252256        },
     257        "_serverPort": 8000,
    253258        "_priority": "medium"
    254259      },
    … …  
    305310          "receive": "<filtered>"
    306311        },
     312        "_serverPort": 8000,
    307313        "_priority": "medium"
    308314      },
    … …  
    359365          "receive": "<filtered>"
    360366        },
     367        "_serverPort": 8000,
    361368        "_priority": "medium"
    362369      },
    … …  
    413420          "receive": "<filtered>"
    414421        },
     422        "_serverPort": 8000,
    415423        "_priority": "medium"
    416424      },
    … …  
    471479          "receive": "<filtered>"
    472480        },
     481        "_serverPort": 8000,
    473482        "_priority": "medium"
    474483      },
    … …  
    535544          "receive": "<filtered>"
    536545        },
     546        "_serverPort": 8000,
    537547        "_priority": "medium"
    538548      },
    … …  
    603613          "receive": "<filtered>"
    604614        },
     615        "_serverPort": 8000,
    605616        "_priority": "medium"
    606617      },
    … …  
    675686          "receive": "<filtered>"
    676687        },
     688        "_serverPort": 8000,
    677689        "_priority": "medium"
    678690      },
    … …  
    751763          "receive": "<filtered>"
    752764        },
     765        "_serverPort": 8000,
    753766        "_priority": "medium"
    754767      }

  • trunk/Source/WebInspectorUI/ChangeLog

    r243038 r243087  
     12019-03-18  Joseph Pecoraro  <pecoraro@apple.com>
     2
     3        Web Inspector: HAR Extension for `serverIPAddress` port number
     4        https://bugs.webkit.org/show_bug.cgi?id=195695
     5
     6        Reviewed by Matt Baker.
     7
     8        * UserInterface/Controllers/HARBuilder.js:
     9        (WI.HARBuilder.entry):
     10        (WI.HARBuilder.port):
     11        * UserInterface/Models/LocalResource.js:
     12        (WI.LocalResource.fromHAREntry):
     13
    1142019-03-16  Nikita Vasilyev  <nvasilyev@apple.com>
    215

  • trunk/Source/WebInspectorUI/UserInterface/Controllers/HARBuilder.js

    r243031 r243087  
    106106        if (resource.remoteAddress) {
    107107            entry.serverIPAddress = HARBuilder.ipAddress(resource.remoteAddress);
    108             // FIXME: <https://webkit.org/b/195695> Web Inspector: HAR Extension for `serverIPAddress` port number
     108
     109            // WebKit Custom Field `_serverPort`.
     110            if (entry.serverIPAddress)
     111                entry._serverPort = HARBuilder.port(resource.remoteAddress);
    109112        }
    110113        if (resource.connectionIdentifier)
    … …  
    294297        // So this always strips the last part.
    295298        return remoteAddress.replace(/:\d+$/, "");
     299    }
     300
     301    static port(remoteAddress)
     302    {
     303        // IP Address, without port.
     304        if (!remoteAddress)
     305            return undefined;
     306
     307        // NOTE: Resource.remoteAddress always includes the port at the end.
     308        // So this always matches the last part.
     309        let index = remoteAddress.lastIndexOf(":");
     310        if (!index)
     311            return undefined;
     312
     313        let portString = remoteAddress.substr(index + 1);
     314        let port = parseInt(portString);
     315        if (isNaN(port))
     316            return undefined;
     317
     318        return port;
    296319    }
    297320

  • trunk/Source/WebInspectorUI/UserInterface/Models/LocalResource.js

    r243031 r243087  
    9898    static fromHAREntry(entry, archiveStartWalltime)
    9999    {
    100         // FIXME: <https://webkit.org/b/195695> Web Inspector: HAR Extension for `serverIPAddress` port number
    101100        // FIXME: <https://webkit.org/b/195694> Web Inspector: HAR Extension for Redirect Timing Info
    102101
    … …  
    159158            finishedTimestamp = timing.responseEnd;
    160159        }
     160
     161        let serverAddress = entry.serverIPAddress || null;
     162        if (serverAddress && typeof entry._serverPort === "number")
     163            serverAddress += ":" + entry._serverPort;
    161164
    162165        return new WI.LocalResource({
    … …  
    183186                protocol: WI.HARBuilder.protocolFromHARProtocol(response.httpVersion),
    184187                priority: WI.HARBuilder.networkPriorityFromHARPriority(entry._priority),
    185                 remoteAddress: entry.serverIPAddress || null,
     188                remoteAddress: serverAddress,
    186189                connectionIdentifier: entry.connection ? parseInt(entry.connection) : null,
    187190                requestHeaderBytesSent: request.headersSize >= 0 ? request.headersSize : NaN,
Note: See TracChangeset for help on using the changeset viewer.