Add support for V2 SMB leases so that epoch checking can be done. #118
Conversation
(Related to new tests for PSCALE-128466)
pike/smb2.py
Outdated
| self.parent_lease_key = None | ||
| self.epoch = None | ||
| self.lease_flags = LeaseFlags.SMB2_LEASE_FLAG_NONE | ||
| self.parent_lease_key = array.array("B", [0] * 16) |
There was a problem hiding this comment.
parent_lease_key and epoch are only for v2 right but we set isV2 later.
There was a problem hiding this comment.
maybe retain the old code and have new code under check if do_v2_lease, then set isV2 within.
There was a problem hiding this comment.
I figured it was harmless to just set it unconditionally, but I can certainly do it this way if you prefer.
(Meanwhile, Masen had given me some review comments for this on slack, and wants me to get rid of my isV2 field and go back to using just the 'flags' for that. So, will be updating this soon...
pike/smb2.py
Outdated
| self.lease_flags = None | ||
| self.parent_lease_key = None | ||
| self.epoch = None | ||
| self.lease_flags = LeaseFlags.SMB2_LEASE_FLAG_NONE |
There was a problem hiding this comment.
Also wondering if we should set SMB2_LEASE_FLAG_PARENT_LEASE_KEY_SET under condition if do_v2_lease ?
There was a problem hiding this comment.
srv currently doesn't support parent lease keys, so we don't want to set the flag. (If we set the flag, we'd also need to actually set a valid parent_lease_key -- which we can't because we don't support. I believe parent_lease_key is related to directory leases.)
| if do_v2_lease: | ||
| self.isV2 = True | ||
| if lease_flags_v2 is not None: | ||
| self.lease_flags = lease_flags_v2 |
There was a problem hiding this comment.
We can just pull out this statement and a similar statement in else outside of if-else block.
There was a problem hiding this comment.
self.lease_flags = lease_flags_v2
(Related to new tests for PSCALE-128466)