Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve file timestamp resolution #1882

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+24 −6
Open

Improve file timestamp resolution #1882

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion examples/karmaSMB.py
View file
Original file line number Diff line number Diff line change
@@ -415,7 +415,11 @@ def smb2QueryDirectory(self, connId, smbServer, recvPacket):
return [smb2.SMB2Error()], None, STATUS_NO_MORE_FILES
else:
origName, targetFile = connData['MS15011']['FileData']
(mode, ino, dev, nlink, uid, gid, size, atime, mtime, ctime) = os.stat(targetFile)
stat_result = os.stat(targetFile)
size = stat_result.st_size
atime = stat_result.st_atime
mtime = stat_result.st_mtime
ctime = stat_result.st_ctime

infoRecord = smb.SMBFindFileIdBothDirectoryInfo( smb.SMB.FLAGS2_UNICODE )
infoRecord['ExtFileAttributes'] = smb.ATTR_NORMAL | smb.ATTR_ARCHIVE
24 changes: 19 additions & 5 deletions impacket/smbserver.py
View file
Original file line number Diff line number Diff line change
@@ -201,7 +201,7 @@ def encodeSMBString(flags, text):
def getFileTime(t):
t *= 10000000
t += 116444736000000000
return t
return int(t)


def getUnixTime(t):
@@ -337,7 +337,9 @@ def queryFsInformation(path, filename, level=None, pktFlags=smb.SMB.FLAGS2_UNICO
fileName = normalize_path(filename)
pathName = os.path.join(path, fileName)
fileSize = os.path.getsize(pathName)
(mode, ino, dev, nlink, uid, gid, size, atime, mtime, ctime) = os.stat(pathName)
stat_result = os.stat(pathName)
mtime = stat_result.st_mtime
ctime = stat_result.st_ctime

if level is None:
lastWriteTime = mtime
@@ -452,7 +454,11 @@ def findFirst2(path, fileName, level, searchAttributes, pktFlags=smb.SMB.FLAGS2_
LOG.error("Wrong level %d!" % level)
return searchResult, searchCount, STATUS_NOT_SUPPORTED

(mode, ino, dev, nlink, uid, gid, size, atime, mtime, ctime) = os.stat(i)
stat_result = os.stat(i)
size = stat_result.st_size
atime = stat_result.st_atime
mtime = stat_result.st_mtime
ctime = stat_result.st_ctime
if os.path.isdir(i):
item['ExtFileAttributes'] = smb.ATTR_DIRECTORY
else:
@@ -531,7 +537,11 @@ def queryPathInformation(path, filename, level):
return None, STATUS_OBJECT_PATH_SYNTAX_BAD

if os.path.exists(pathName):
(mode, ino, dev, nlink, uid, gid, size, atime, mtime, ctime) = os.stat(pathName)
stat_result = os.stat(pathName)
size = stat_result.st_size
atime = stat_result.st_atime
mtime = stat_result.st_mtime
ctime = stat_result.st_ctime
if os.path.isdir(pathName):
fileAttributes = smb.ATTR_DIRECTORY
else:
@@ -2100,7 +2110,11 @@ def smbComQueryInformation2(connId, smbServer, SMBCommand, recvPacket):
errorCode = STATUS_SUCCESS
pathName = connData['OpenedFiles'][queryInformation2['Fid']]['FileName']
try:
(mode, ino, dev, nlink, uid, gid, size, atime, mtime, ctime) = os.stat(pathName)
stat_result = os.stat(pathName)
size = stat_result.st_size
atime = stat_result.st_atime
mtime = stat_result.st_mtime
ctime = stat_result.st_ctime
respParameters['CreateDate'] = getSMBDate(ctime)
respParameters['CreationTime'] = getSMBTime(ctime)
respParameters['LastAccessDate'] = getSMBDate(atime)