Skip to content

Commit

Permalink
Place PASESession on new fabric
Browse files Browse the repository at this point in the history
PASE sessions start with no fabric, but during commissioning,
after OperationalCredentialsCluster::AddNOC, they should be
placed on the newly commissioned fabric so administrative
actions pertaining to the newly commissioned fabric can be
performed over the PASE session, if desired.

Work towards issue project-chip#10242
  • Loading branch information
mlepage-google committed Jan 19, 2022
1 parent a04bf54 commit c7f2c43
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -450,6 +450,9 @@ bool emberAfOperationalCredentialsClusterAddNOCCallback(app::CommandHandler * co
err = Server::GetInstance().GetFabricTable().Store(fabricIndex);
VerifyOrExit(err == CHIP_NO_ERROR, nocResponse = ConvertToNOCResponseStatus(err));

// Notify the secure session of the new fabric.
commandObj->GetExchangeContext()->GetSessionHandle()->AsSecureSession()->NewFabric(commandObj->GetAccessingFabricIndex());

// We might have a new operational identity, so we should start advertising it right away.
app::DnssdServer::Instance().AdvertiseOperational();

Expand Down
6 changes: 3 additions & 3 deletions src/transport/SecureSession.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ Access::SubjectDescriptor SecureSession::GetSubjectDescriptor() const
}
else if (IsPAKEKeyId(mPeerNodeId))
{
subjectDescriptor.authMode = Access::AuthMode::kPase;
subjectDescriptor.subject = mPeerNodeId;
// TODO(#10242): PASE *can* have fabric in some situations
subjectDescriptor.authMode = Access::AuthMode::kPase;
subjectDescriptor.subject = mPeerNodeId;
subjectDescriptor.fabricIndex = mPaseFabric;
}
else
{
Expand Down
16 changes: 16 additions & 0 deletions src/transport/SecureSession.h
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,18 @@ class SecureSession : public Session
uint16_t GetPeerSessionId() const { return mPeerSessionId; }
FabricIndex GetFabricIndex() const { return mFabric; }

// Should only be called for PASE sessions, which start with undefined fabric,
// to place on a newly commissioned fabric after successful
// OperationalCredentialsCluster::AddNOC
CHIP_ERROR NewFabric(FabricIndex fabricIndex)
{
// TODO: should check that secure session type is PASE and current value is undefined
// (i.e. that it's called exactly once in proper circumstances)
// but that's difficult until issue #13711 is addressed
mPaseFabric = fabricIndex;
return CHIP_NO_ERROR;
}

System::Clock::Timestamp GetLastActivityTime() const { return mLastActivityTime; }
void MarkActive() { mLastActivityTime = System::SystemClock().GetMonotonicTimestamp(); }

Expand Down Expand Up @@ -141,6 +153,10 @@ class SecureSession : public Session
const uint16_t mPeerSessionId;
const FabricIndex mFabric;

// PASE sessions start with undefined fabric, but can be placed on a newly
// commissioned fabric after successful OperationalCredentialsCluster::AddNOC
FabricIndex mPaseFabric = kUndefinedFabricIndex;

PeerAddress mPeerAddress;
System::Clock::Timestamp mLastActivityTime;
ReliableMessageProtocolConfig mMRPConfig;
Expand Down

0 comments on commit c7f2c43

Please sign in to comment.