diff options
| author | Sunitha Harish <sunharis@in.ibm.com> | 2020-10-30 10:37:30 +0300 |
|---|---|---|
| committer | Ed Tanous <ed@tanous.net> | 2020-11-10 19:30:11 +0300 |
| commit | c0ea7ae1c502fa2c67b0a58aee05b75581dafa7a (patch) | |
| tree | 812b2d37bb153377a5897b434ddef7fc8137d7e9 /redfish-core/lib/redfish_sessions.hpp | |
| parent | a0744d38e93863ce3fb4bef2d4c70f9e9f640840 (diff) | |
| download | bmcweb-c0ea7ae1c502fa2c67b0a58aee05b75581dafa7a.tar.xz | |
Redfish Session : Support ClientOriginIPAddress
This commit implements the ClientOriginIPAddress property on
the session resource. The IP address is persisted across the reboot
Tested by:
1. Create session
POST https://${bmc}/redfish/v1/SessionService/Sessions -d '{"UserName":<>, "Password":<>}'
2. Check the session gets updated with the ClientOriginIPAddress
GET https://${bmc}/redfish/v1/SessionService/Sessions/<id>
3. Redfish validator passed
4. Create session and reboot the BMC to ensure the IP address is persisted
5. Tested the basic auth populates the clientIp at req
Signed-off-by: Sunitha Harish <sunharis@in.ibm.com>
Change-Id: Iaa60d0657c991bde4bcf6c86819055c71c92e421
Diffstat (limited to 'redfish-core/lib/redfish_sessions.hpp')
| -rw-r--r-- | redfish-core/lib/redfish_sessions.hpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/redfish-core/lib/redfish_sessions.hpp b/redfish-core/lib/redfish_sessions.hpp index e3259895d2..c38f1026d2 100644 --- a/redfish-core/lib/redfish_sessions.hpp +++ b/redfish-core/lib/redfish_sessions.hpp @@ -60,15 +60,15 @@ class Sessions : public Node res.jsonValue["UserName"] = session->username; res.jsonValue["@odata.id"] = "/redfish/v1/SessionService/Sessions/" + session->uniqueId; - res.jsonValue["@odata.type"] = "#Session.v1_0_2.Session"; + res.jsonValue["@odata.type"] = "#Session.v1_3_0.Session"; res.jsonValue["Name"] = "User Session"; res.jsonValue["Description"] = "Manager User Session"; + res.jsonValue["ClientOriginIPAddress"] = session->clientIp; +#ifdef BMCWEB_ENABLE_IBM_MANAGEMENT_CONSOLE res.jsonValue["Oem"]["OpenBMC"]["@odata.type"] = "#OemSession.v1_0_0.Session"; -#ifdef BMCWEB_ENABLE_IBM_MANAGEMENT_CONSOLE res.jsonValue["Oem"]["OpenBMC"]["ClientID"] = session->clientId; #endif - res.jsonValue["Oem"]["OpenBMC"]["ClientOriginIP"] = session->clientIp; res.end(); } @@ -174,7 +174,6 @@ class SessionCollection : public Node std::string password; std::optional<nlohmann::json> oemObject; std::string clientId; - std::string clientIp; if (!json_util::readJson(req, res, "UserName", username, "Password", password, "Oem", oemObject)) { @@ -231,7 +230,7 @@ class SessionCollection : public Node std::shared_ptr<persistent_data::UserSession> session = persistent_data::SessionStore::getInstance().generateUserSession( username, persistent_data::PersistenceType::TIMEOUT, - isConfigureSelfOnly, clientId, clientIp); + isConfigureSelfOnly, clientId, req.ipAddress.to_string()); res.addHeader("X-Auth-Token", session->sessionToken); res.addHeader("Location", "/redfish/v1/SessionService/Sessions/" + session->uniqueId); |