[WIP] RPM packaging doesn't flag .NET Core DLLs as executables

.vscode/launch.json

@@ -0,0 +1,28 @@
+{
+   // Use IntelliSense to find out which attributes exist for C# debugging
+   // Use hover for the description of the existing attributes
+   // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
+   "version": "0.2.0",
+   "configurations": [
+        {
+            "name": ".NET Core Launch (console)",
+            "type": "coreclr",
+            "request": "launch",
+            "preLaunchTask": "build",
+            // If you have changed target frameworks, make sure to update the program path.
+            "program": "${workspaceFolder}/dotnet-deb/bin/Debug/netcoreapp1.0/dotnet-deb.dll",
+            "args": [],
+            "cwd": "${workspaceFolder}/dotnet-deb",
+            // For more information about the 'console' field, see https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md#console-terminal-window
+            "console": "internalConsole",
+            "stopAtEntry": false,
+            "internalConsoleOptions": "openOnSessionStart"
+        },
+        {
+            "name": ".NET Core Attach",
+            "type": "coreclr",
+            "request": "attach",
+            "processId": "${command:pickProcess}"
+        }
+    ,]
+}

.vscode/tasks.json

@@ -0,0 +1,15 @@
+{
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "build",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "build",
+                "${workspaceFolder}/dotnet-deb/dotnet-deb.csproj"
+            ],
+            "problemMatcher": "$msCompile"
+        }
+    ]
+}

Packaging.Targets.Tests/Rpm/RpmMetadataTests.cs

@@ -117,7 +117,7 @@ public void SetFilesTest()
                 {
                     ArchiveBuilder builder = new ArchiveBuilder(new PlistFileAnalyzer());
                     RpmPackageCreator creator = new RpmPackageCreator(new PlistFileAnalyzer());
-                    var entries = builder.FromCpio(cpio);
+                    var entries = builder.FromCpio(originalPackage, cpio);
                     var files = creator.CreateFiles(entries);
 
                     var metadata = new PublicRpmMetadata(package);
@@ -186,7 +186,7 @@ public void CreatePackageMetadata()
                 {
                     ArchiveBuilder builder = new ArchiveBuilder(new PlistFileAnalyzer());
                     RpmPackageCreator creator = new RpmPackageCreator(new PlistFileAnalyzer());
-                    var entries = builder.FromCpio(cpio);
+                    var entries = builder.FromCpio(originalPackage, cpio);
                     var files = creator.CreateFiles(entries);
 
                     // Core routine to populate files and dependencies

Packaging.Targets.Tests/Rpm/RpmPackageCreatorTests.cs

@@ -46,7 +46,7 @@ public void CreateFiles(string rpm, string analyzerName)
 
                     RpmPackageCreator creator = new RpmPackageCreator(analyzer);
                     ArchiveBuilder builder = new ArchiveBuilder(analyzer);
-                    var entries = builder.FromCpio(cpio);
+                    var entries = builder.FromCpio(originalPackage, cpio);
                     var files = creator.CreateFiles(entries);
 
                     var originalMetadata = new RpmMetadata(originalPackage);
@@ -98,7 +98,7 @@ public void CalculateOffsetTest()
                 {
                     ArchiveBuilder builder = new ArchiveBuilder(new PlistFileAnalyzer());
                     RpmPackageCreator creator = new RpmPackageCreator(new PlistFileAnalyzer());
-                    var entries = builder.FromCpio(cpio);
+                    var entries = builder.FromCpio(originalPackage, cpio);
                     var files = creator.CreateFiles(entries);
 
                     // Core routine to populate files and dependencies
@@ -151,7 +151,7 @@ public void CalculateSignatureTest()
                 using (var cpio = new CpioFile(payloadStream, false))
                 {
                     ArchiveBuilder builder = new ArchiveBuilder(new PlistFileAnalyzer());
-                    var entries = builder.FromCpio(cpio);
+                    var entries = builder.FromCpio(originalPackage, cpio);
                     files = creator.CreateFiles(entries);
                 }
 
@@ -253,7 +253,7 @@ public void CreatePackageTest()
                 using (CpioFile cpio = new CpioFile(decompressedPayloadStream, leaveOpen: false))
                 {
                     ArchiveBuilder builder = new ArchiveBuilder();
-                    archive = builder.FromCpio(cpio);
+                    archive = builder.FromCpio(originalPackage, cpio);
                 }
 
                 using (var decompressedPayloadStream = RpmPayloadReader.GetDecompressedPayloadStream(originalPackage))
@@ -318,7 +318,7 @@ public void CreatePackageBinaryTest()
                 using (CpioFile cpio = new CpioFile(decompressedPayloadStream, leaveOpen: false))
                 {
                     ArchiveBuilder builder = new ArchiveBuilder();
-                    archive = builder.FromCpio(cpio);
+                    archive = builder.FromCpio(originalPackage, cpio);
                 }
 
                 using (var compressedPayloadStream = RpmPayloadReader.GetCompressedPayloadStream(originalPackage))

Packaging.Targets/ArchiveBuilder.cs

@@ -6,6 +6,8 @@
 using System.Collections.ObjectModel;
 using System.IO;
 using System.Linq;
+using System.Reflection;
+using System.Runtime.Loader;
 using System.Security.Cryptography;
 using System.Text;
 
@@ -46,20 +48,23 @@ public ArchiveBuilder(IFileAnalyzer analyzer)
         /// <summary>
         /// Extracts the <see cref="ArchiveEntry"/> objects from a CPIO file.
         /// </summary>
+        /// <param name="rpmPackage"></param>
         /// <param name="file">
-        /// The CPIO file from which to extract the entries.
+        ///     The CPIO file from which to extract the entries.
         /// </param>
         /// <returns>
         /// A list of <see cref="ArchiveEntry"/> objects representing the data in the CPIO file.
         /// </returns>
-        public List<ArchiveEntry> FromCpio(CpioFile file)
+        public List<ArchiveEntry> FromCpio(RpmPackage rpmPackage, CpioFile file)
         {
             List<ArchiveEntry> value = new List<ArchiveEntry>();
             byte[] buffer = new byte[1024];
             byte[] fileHeader = null;
+            int currentEntry = -1;
 
             while (file.Read())
             {
+                currentEntry++;
                 fileHeader = null;
 
                 ArchiveEntry entry = new ArchiveEntry()
@@ -75,9 +80,40 @@ public List<ArchiveEntry> FromCpio(CpioFile file)
                     LinkTo = string.Empty,
                     Sha256 = Array.Empty<byte>(),
                     SourceFilename = null,
-                    IsAscii = true
+                    IsAscii = true,
+
                 };
 
+
+                var fileColor = (RpmFileColor)(rpmPackage.Header.Records[IndexTag.RPMTAG_FILECOLORS]?.Value as Collection<int>)?[currentEntry];
+                var fileFlag = (RpmFileFlags)(rpmPackage.Header.Records[IndexTag.RPMTAG_FILEFLAGS]?.Value as Collection<int>)?[currentEntry];
+                var fileClassIndex = (int)(rpmPackage.Header.Records[IndexTag.RPMTAG_FILECLASS]?.Value as Collection<int>)?[currentEntry];
+                var fileClass = (rpmPackage.Header.Records[IndexTag.RPMTAG_CLASSDICT]?.Value as Collection<string>)?[fileClassIndex];
+
+                entry.Group = (rpmPackage.Header.Records[IndexTag.RPMTAG_FILEGROUPNAME]?.Value as Collection<string>)?[currentEntry];
+                entry.Owner = (rpmPackage.Header.Records[IndexTag.RPMTAG_FILEUSERNAME]?.Value as Collection<string>)?[currentEntry];
+                entry.LinkTo = (rpmPackage.Header.Records[IndexTag.RPMTAG_FILELINKTOS]?.Value as Collection<string>)?[currentEntry];
+
+                if ((fileFlag & RpmFileFlags.RPMFILE_DOC) == RpmFileFlags.RPMFILE_DOC)
+                {
+                    entry.Type = ArchiveEntryType.Doc;
+                }
+
+                if ((fileColor & RpmFileColor.RPMFC_ELF32) == RpmFileColor.RPMFC_ELF32)
+                {
+                    entry.Type = ArchiveEntryType.Executable32;
+                }
+
+                if ((fileColor & RpmFileColor.RPMFC_ELF64) == RpmFileColor.RPMFC_ELF64)
+                {
+                    entry.Type = ArchiveEntryType.Executable64;
+                }
+
+                if (fileClass.Contains("mono"))
+                {
+                    entry.Type = ArchiveEntryType.NetAssembly;
+                }
+
                 if (entry.Mode.HasFlag(LinuxFileMode.S_IFREG) && !entry.Mode.HasFlag(LinuxFileMode.S_IFLNK))
                 {
                     using (var fileStream = file.Open())
@@ -106,8 +142,6 @@ public List<ArchiveEntry> FromCpio(CpioFile file)
 
                         entry.Sha256 = hasher.GetHashAndReset();
                     }
-
-                    entry.Type = this.GetArchiveEntryType(fileHeader);
                 }
                 else if (entry.Mode.HasFlag(LinuxFileMode.S_IFLNK))
                 {
@@ -277,25 +311,58 @@ protected void AddFile(string entry, string relativePath, string prefix, List<Ar
                     md5hash = md5hasher.GetHashAndReset();
                 }
 
-                // Only support ELF32 and ELF64 colors; otherwise default to BLACK.
-                ArchiveEntryType entryType = this.GetArchiveEntryType(fileHeader);
-
-                var mode = LinuxFileMode.S_IROTH | LinuxFileMode.S_IRGRP | LinuxFileMode.S_IRUSR | LinuxFileMode.S_IFREG;
-
-                if (entryType == ArchiveEntryType.Executable32 || entryType == ArchiveEntryType.Executable64)
+                ArchiveEntryType entryType;
+                if (fileMetadata != null && fileMetadata.GetDocumentation())
                 {
-                    mode |= LinuxFileMode.S_IXOTH | LinuxFileMode.S_IXGRP | LinuxFileMode.S_IWUSR | LinuxFileMode.S_IXUSR;
+                    entryType = ArchiveEntryType.Doc;
                 }
+                else
+                {
+                    // check whether it's an ELF file
+                    entryType = this.GetArchiveEntryType(fileHeader);
 
-                // If a Linux path has been specified, use that one, else, use the default one based on the prefix
-                // + current file name.
-                string name = fileMetadata?.GetLinuxPath();
+                    // check whether this is a .NET assembly
+                    if (entryType == ArchiveEntryType.None && File.Exists(fileName))
+                    {
+                        try
+                        {
+                            var assemblyName = AssemblyLoadContext.GetAssemblyName(fileName);
+                            entryType = ArchiveEntryType.NetAssembly;
+                        }
+                        catch (BadImageFormatException)
+                        {
+                        }
+                    }
+                }
 
-                if (name == null)
+                LinuxFileMode mode = 0;
+                if (fileMetadata.GetLinuxFileMode() != null)
+                {
+                    // allow for the file mode to use numbers or symbols per
+                    // our enum and bitwise or
+                    var smodes = fileMetadata.GetLinuxFileMode().Split('|', ' ');
+                    foreach (var s in smodes)
+                    {
+                        if (Enum.TryParse(s, out LinuxFileMode m))
+                        {
+                            mode |= m;
+                        }
+                    }
+                }
+                else
                 {
-                    name = prefix + "/" + fileName;
+                    mode = LinuxFileMode.S_IROTH | LinuxFileMode.S_IRGRP | LinuxFileMode.S_IRUSR |
+                           LinuxFileMode.S_IFREG;
+                    if (entryType == ArchiveEntryType.Executable32 || entryType == ArchiveEntryType.Executable64)
+                    {
+                        mode |= LinuxFileMode.S_IXOTH | LinuxFileMode.S_IXGRP | LinuxFileMode.S_IWUSR |
+                                LinuxFileMode.S_IXUSR;
+                    }
                 }
 
+                // If a Linux path has been specified, use that one, else, use the default one based on the prefix
+                // + current file name.
+                string name = fileMetadata?.GetLinuxPath() ?? prefix + "/" + fileName;
                 string linkTo = string.Empty;
 
                 if (mode.HasFlag(LinuxFileMode.S_IFLNK))
@@ -322,7 +389,7 @@ protected void AddFile(string entry, string relativePath, string prefix, List<Ar
                     {
                         mode = (LinuxFileMode)Convert.ToUInt32(overridenFileMode, 8);
                     }
-                    catch (Exception ex)
+                    catch (Exception)
                     {
                         throw new Exception($"Could not parse the file mode '{overridenFileMode}' for file '{name}'. Make sure to set the LinuxFileMode attriubute to an octal representation of a Unix file mode.");
                     }

Packaging.Targets/IO/ArchiveEntryType.cs

@@ -18,6 +18,16 @@ public enum ArchiveEntryType
         /// <summary>
         /// The file is a 64-bit executable.
         /// </summary>
-        Executable64 = 2
+        Executable64 = 2,
+
+        /// <summary>
+        /// The file is a module (like a .NET assembly)
+        /// </summary>
+        NetAssembly = 3,
+
+        /// <summary>
+        /// This file is a documentation entry
+        /// </summary>
+        Doc = 4
     }
 }

Packaging.Targets/Packaging.Targets.csproj

@@ -50,6 +50,7 @@
     <PackageReference Include="SharpZipLib.NETStandard" Version="0.86.0.1">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
+    <PackageReference Include="System.Runtime.Loader" Version="4.3.0" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.5'">
     <PackageReference Include="System.Globalization.Extensions" Version="4.3.0" />

Packaging.Targets/Rpm/FileAnalyzer.cs

@@ -33,19 +33,7 @@ public virtual Collection<PackageDependency> DetermineProvides(ArchiveEntry entr
         /// <inheritdoc/>
         public virtual RpmFileFlags DetermineFlags(ArchiveEntry entry)
         {
-            // The only custom flags which are supported for now are the RPMFILE_DOC flags for non-executable
-            // files.
-            if (entry.Mode.HasFlag(LinuxFileMode.S_IFDIR))
-            {
-                return RpmFileFlags.None;
-            }
-            else if (entry.Mode.HasFlag(LinuxFileMode.S_IFLNK))
-            {
-                return RpmFileFlags.None;
-            }
-            else if (!entry.Mode.HasFlag(LinuxFileMode.S_IXGRP)
-                    && !entry.Mode.HasFlag(LinuxFileMode.S_IXOTH)
-                    && !entry.Mode.HasFlag(LinuxFileMode.S_IXUSR))
+            if (entry.Type == ArchiveEntryType.Doc)
             {
                 return RpmFileFlags.RPMFILE_DOC;
             }
@@ -67,6 +55,9 @@ public virtual RpmFileColor DetermineColor(ArchiveEntry entry)
                 case ArchiveEntryType.Executable64:
                     return RpmFileColor.RPMFC_ELF64;
 
+                case ArchiveEntryType.NetAssembly:
+                    return RpmFileColor.RPMFC_INCLUDE;
+
                 default:
                     return RpmFileColor.RPMFC_BLACK;
             }
@@ -92,6 +83,11 @@ public virtual string DetermineClass(ArchiveEntry entry)
                 return string.Empty;
             }
 
+            if (entry.Type == ArchiveEntryType.NetAssembly)
+            {
+                return "mono";
+            }
+
             if (entry.TargetPath.EndsWith(".svg"))
             {
                 return "SVG Scalable Vector Graphics image";

Packaging.Targets/Rpm/RpmFileColor.cs

@@ -2,41 +2,21 @@
 
 namespace Packaging.Targets.Rpm
 {
+    /*
+     * from https://github.com/rpm-software-management/rpm/blob/master/build/rpmfc.h
+     */
+
     /// <summary>
     /// Determines the type of the file.
     /// </summary>
     [Flags]
-    internal enum RpmFileColor
+    internal enum RpmFileColor : int
     {
         RPMFC_BLACK = 0,
         RPMFC_ELF32 = 1 << 0,
         RPMFC_ELF64 = 1 << 1,
         RPMFC_ELFMIPSN32 = 1 << 2,
-        RPMFC_PKGCONFIG = 1 << 4,
-        RPMFC_LIBTOOL = 1 << 5,
-        RPMFC_BOURNE = 1 << 6,
-        RPMFC_MODULE = 1 << 7,
-        RPMFC_EXECUTABLE = 1 << 8,
-        RPMFC_SCRIPT = 1 << 9,
-        RPMFC_TEXT = 1 << 10,
-        RPMFC_DATA = 1 << 11,
-        RPMFC_DOCUMENT = 1 << 12,
-        RPMFC_STATIC = 1 << 13,
-        RPMFC_NOTSTRIPPED = 1 << 14,
-        RPMFC_COMPRESSED = 1 << 15,
-        RPMFC_DIRECTORY = 1 << 16,
-        RPMFC_SYMLINK = 1 << 17,
-        RPMFC_DEVICE = 1 << 18,
-        RPMFC_LIBRARY = 1 << 19,
-        RPMFC_ARCHIVE = 1 << 20,
-        RPMFC_FONT = 1 << 21,
-        RPMFC_IMAGE = 1 << 22,
-        RPMFC_MANPAGE = 1 << 23,
-        RPMFC_PERL = 1 << 24,
-        RPMFC_JAVA = 1 << 25,
-        RPMFC_PYTHON = 1 << 26,
-        RPMFC_PHP = 1 << 27,
-        RPMFC_TCL = 1 << 28,
+        RPMFC_ELF = RPMFC_ELF32 | RPMFC_ELF64 | RPMFC_ELFMIPSN32,
         RPMFC_WHITE = 1 << 29,
         RPMFC_INCLUDE = 1 << 30,
         RPMFC_ERROR = 1 << 31