claunia/osrepodbmgr
1
0
Fork 0
mirror of https://github.com/claunia/osrepodbmgr.git synced 2025-12-16 19:14:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not continue with symbolic links, not yet supported.

Browse Source
This commit is contained in:
Natalia Portillo
2017-05-21 14:26:21 +01:00
parent 93a6d217c7
commit 01461176f3
3 changed files with 33 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
osrepodbmgr.Core/ChangeLog
View File

@@ -1,3 +1,9 @@
2017-05-21 Natalia Portillo <claunia@claunia.com>
* Workers/Files.cs:
* Workers/Compression.cs:
Do not continue with symbolic links, not yet supported.
2017-05-21 Natalia Portillo <claunia@claunia.com> 2017-05-21 Natalia Portillo <claunia@claunia.com>
* Workers/Clamd.cs: * Workers/Clamd.cs:

18
osrepodbmgr.Core/Workers/Compression.cs
View File

@@ -345,11 +345,29 @@ namespace osrepodbmgr.Core
#endif #endif
long counter = 0; long counter = 0;
string format = null; string format = null;
bool isLink = false;
JsonTextReader jsReader = new JsonTextReader(new StringReader(lsarOutput)); JsonTextReader jsReader = new JsonTextReader(new StringReader(lsarOutput));
while(jsReader.Read()) while(jsReader.Read())
{ {
if(jsReader.TokenType == JsonToken.PropertyName && jsReader.Value != null && jsReader.Value.ToString() == "XADFileName") if(jsReader.TokenType == JsonToken.PropertyName && jsReader.Value != null && jsReader.Value.ToString() == "XADFileName")
counter++; counter++;
else if(jsReader.TokenType == JsonToken.PropertyName && jsReader.Value != null && jsReader.Value.ToString() == "XADIsLink")
{
jsReader.Read();
if(jsReader.TokenType == JsonToken.Integer)
isLink = int.Parse(jsReader.Value.ToString()) > 0;
}
else if(jsReader.TokenType == JsonToken.PropertyName && jsReader.Value != null && jsReader.Value.ToString() == "XADIsHardLink")
{
jsReader.Read();
// TODO: Support symlinks, devices, hardlinks, whatever?
if(jsReader.TokenType == JsonToken.Integer && isLink && int.Parse(jsReader.Value.ToString()) == 0)
{
if(Failed != null)
Failed("Archive contains unsupported symbolic links, not continuing.");
return;
}
}
else if(jsReader.TokenType == JsonToken.PropertyName && jsReader.Value != null && jsReader.Value.ToString() == "lsarFormatName") else if(jsReader.TokenType == JsonToken.PropertyName && jsReader.Value != null && jsReader.Value.ToString() == "lsarFormatName")
{ {
jsReader.Read(); jsReader.Read();

9
osrepodbmgr.Core/Workers/Files.cs
View File

@@ -338,6 +338,15 @@ namespace osrepodbmgr.Core
filesPath = Context.path; filesPath = Context.path;
string relpath = file.Substring(filesPath.Length + 1); string relpath = file.Substring(filesPath.Length + 1);
// TODO: Support symlinks, devices, hardlinks, whatever?
if(fi.Attributes.HasFlag(FileAttributes.ReparsePoint))
{
if(Failed != null)
Failed(string.Format("{0} is an unsupported symbolic link, not continuing.", relpath));
return;
}
if(UpdateProgress != null) if(UpdateProgress != null)
UpdateProgress(string.Format("Hashing file {0} of {1}", counter, Context.files.Count), null, counter, Context.files.Count); UpdateProgress(string.Format("Hashing file {0} of {1}", counter, Context.files.Count), null, counter, Context.files.Count);
FileStream fileStream = new FileStream(file, FileMode.Open, FileAccess.Read); FileStream fileStream = new FileStream(file, FileMode.Open, FileAccess.Read);