release-engineering/dist-git
1
0
Fork 0
mirror of https://github.com/release-engineering/dist-git.git synced 2025-02-23 23:12:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

add support for setting mtime for an uploaded file

Browse source
This commit is contained in:
clime 2018-11-15 14:37:30 +01:00
parent d012620be9
commit d2329ea330
2 changed files with 28 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
beaker-tests/tests/direct-test/run.sh
View file

@ -59,6 +59,22 @@ rlJournalStart
resp=`curl --silent -X POST http://pkgs.example.org/repo/pkgs/upload.cgi -F name=foo -F md5sum=80e541f050d558424d62743195481595 -F file=@"$SCRIPTDIR/../../data/prunerepo-1.1-1.fc23.src.rpm"` resp=`curl --silent -X POST http://pkgs.example.org/repo/pkgs/upload.cgi -F name=foo -F md5sum=80e541f050d558424d62743195481595 -F file=@"$SCRIPTDIR/../../data/prunerepo-1.1-1.fc23.src.rpm"`
rlRun "grep -q 'Module \"foo\" does not exist!' <<< '$resp'" rlRun "grep -q 'Module \"foo\" does not exist!' <<< '$resp'"
# test that mtime timestamp is preserved if sent
pkgs_cmd 'sudo rm -rf /var/lib/dist-git/cache/lookaside/pkgs/prunerepo'
resp=`curl --silent -X POST http://pkgs.example.org/repo/pkgs/upload.cgi -F name=prunerepo -F sha512sum=a5f31ae7586dae8dc1ca9a91df208893a0c3ab0032ab153c12eb4255f7219e4baec4c7581f353295c52522fee155c64f1649319044fd1bbb40451f123496b6b3 -F file=@"$SCRIPTDIR/../../data/prunerepo-1.1-1.fc23.src.rpm" -F mtime=1234`
rlRun "grep -q 'stored OK' <<< '$resp'"
mtime_verbose=`curl -s --head http://pkgs.example.org/repo/pkgs/prunerepo/prunerepo-1.1-1.fc23.src.rpm/sha512/a5f31ae7586dae8dc1ca9a91df208893a0c3ab0032ab153c12eb4255f7219e4baec4c7581f353295c52522fee155c64f1649319044fd1bbb40451f123496b6b3/prunerepo-1.1-1.fc23.src.rpm | grep 'Last-Modified:' | sed -E 's/^Last-Modified:\s*(.*)/\1/'`
mtime=`date +%s --date="$mtime_verbose"`
rlAssertEquals "Verify that we got the correct timestamp back" $mtime 1234
pkgs_cmd 'sudo rm -rf /var/lib/dist-git/cache/lookaside/pkgs/prunerepo'
# Invalid mtime value returns 400 Bad Request
resp=`curl -w '%{response_code}' --silent -X POST http://pkgs.example.org/repo/pkgs/upload.cgi -F name=prunerepo -F sha512sum=a5f31ae7586dae8dc1ca9a91df208893a0c3ab0032ab153c12eb4255f7219e4baec4c7581f353295c52522fee155c64f1649319044fd1bbb40451f123496b6b3 -F file=@"$SCRIPTDIR/../../data/prunerepo-1.1-1.fc23.src.rpm" -F mtime=invalid`
rlRun "grep -q '400 Bad Request' <<< '$resp'"
cd $CWD cd $CWD
rlPhaseEnd rlPhaseEnd

12
scripts/httpd/upload.cgi
View file

@ -13,6 +13,7 @@ import hashlib
import os import os
import sys import sys
import tempfile import tempfile
import time
import fedmsg import fedmsg
import fedmsg.config import fedmsg.config
@ -253,6 +254,17 @@ def main():
os.rename(tmpfile, dest_file) os.rename(tmpfile, dest_file)
os.chmod(dest_file, 0644) os.chmod(dest_file, 0644)
# set mtime of the uploaded file if provided
if 'mtime' in form:
mtime_str = form.getvalue('mtime')
try:
mtime = int(mtime_str)
except ValueError:
send_error('Invalid value sent for mtime "%s". Aborting.' % mtime_str,
status='400 Bad Request')
os.utime(dest_file, (time.time(), mtime))
sys.stderr.write('[username=%s] Stored %s (%d bytes)' % (username, sys.stderr.write('[username=%s] Stored %s (%d bytes)' % (username,
dest_file, dest_file,
filesize)) filesize))