Deployment aspects

.gitignore

@@ -84,6 +84,8 @@ StyleCopReport.xml
 *.pidb
 *.svclog
 *.scc
+*.dll
+*.exe
 
 # Chutzpah Test files
 _Chutzpah*

Capnp.Net.Runtime/Capnp.Net.Runtime.Std20.xml

@@ -540,7 +540,7 @@
             <exception cref="T:System.IO.EndOfStreamException">The end of the stream is reached.</exception>
             <exception cref="T:System.ObjectDisposedException">The stream is closed.</exception>
             <exception cref="T:System.IO.IOException">An I/O error occurs.</exception>
-            <exception cref="T:System.IO.InvalidDataException">Encountered invalid framing data.</exception>
+            <exception cref="T:System.IO.InvalidDataException">Encountered invalid framing data, too many or too large segments</exception>
             <exception cref="T:System.OutOfMemoryException">Too many or too large segments, probably due to invalid framing data.</exception>
         </member>
         <member name="T:Capnp.ICapnpSerializable">

Capnp.Net.Runtime/Framing.cs

@@ -21,7 +21,7 @@ namespace Capnp
         /// <exception cref="EndOfStreamException">The end of the stream is reached.</exception>
         /// <exception cref="ObjectDisposedException">The stream is closed.</exception>
         /// <exception cref="IOException">An I/O error occurs.</exception>
-        /// <exception cref="InvalidDataException">Encountered invalid framing data.</exception>
+        /// <exception cref="InvalidDataException">Encountered invalid framing data, too many or too large segments</exception>
         /// <exception cref="OutOfMemoryException">Too many or too large segments, probably due to invalid framing data.</exception>
         public static WireFrame ReadSegments(Stream stream)
         {
@@ -39,15 +39,28 @@ namespace Capnp
                 throw new InvalidDataException("Encountered invalid framing data");
             }
 
+            // Cannot have more segments than the traversal limit
+            if (scount >= SecurityOptions.TraversalLimit)
+            {
+                throw new InvalidDataException("Too many segments. Probably invalid data. Try increasing the traversal limit.");
+            }
+
             var buffers = new Memory<ulong>[scount];
 
             for (uint i = 0; i < scount; i++)
             {
                 uint size = reader.ReadUInt32();
+
                 if (size == 0)
                 {
                     throw new EndOfStreamException("Stream closed");
                 }
+
+                if (size >= SecurityOptions.TraversalLimit)
+                {
+                    throw new InvalidDataException("Too large segment. Probably invalid data. Try increasing the traversal limit.");
+                }
+
                 buffers[i] = new Memory<ulong>(new ulong[size]);
             }
 

capnpc-csharp/Program.cs

@@ -1,8 +1,6 @@
 using Capnp;
 using System;
 using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices;
 
 namespace CapnpC
 {
@@ -17,22 +15,33 @@ namespace CapnpC
                 input = new FileStream(args[0], FileMode.Open, FileAccess.Read);
             }
             else
-            {
+            { 
+                Console.WriteLine("Cap'n Proto C# code generator backend");
+                Console.WriteLine("expecting binary-encoded code generation request from standard input");
+
                 input = Console.OpenStandardInput();
             }
 
-            WireFrame segments;
+            try
-
-            using (input)
             {
-                segments = Framing.ReadSegments(input);
+                WireFrame segments;
-            }
 
-            var dec = DeserializerState.CreateRoot(segments);
+                using (input)
-            var reader = Schema.CodeGeneratorRequest.Reader.Create(dec);
+                {
-            var model = Model.SchemaModel.Create(reader);
+                    segments = Framing.ReadSegments(input);
-            var codeGen = new Generator.CodeGenerator(model, new Generator.GeneratorOptions());
+                }
-            codeGen.Generate();
+
+                var dec = DeserializerState.CreateRoot(segments);
+                var reader = Schema.CodeGeneratorRequest.Reader.Create(dec);
+                var model = Model.SchemaModel.Create(reader);
+                var codeGen = new Generator.CodeGenerator(model, new Generator.GeneratorOptions());
+                codeGen.Generate();
+            }
+            catch (Exception exception)
+            {
+                Console.Error.WriteLine(exception.Message);
+                Environment.ExitCode = -1;
+            }
         }
     }
 }

capnpc-csharp/capnpc-csharp.csproj

@@ -1,10 +1,18 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.1</TargetFramework>
     <RootNamespace>CapnpC</RootNamespace>
     <LangVersion>7.1</LangVersion>
+    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <Authors>Christian Köllner and contributors</Authors>
+    <Description>Cap'n Proto C# code generator backend</Description>
+    <Copyright>Christian Köllner and contributors</Copyright>
+    <PackageProjectUrl>https://github.com/c80k/capnproto-dotnetcore</PackageProjectUrl>
+    <RepositoryType>Git</RepositoryType>
+    <PackageTags>capnp capnpc RPC serialization cerealization</PackageTags>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

chocolatey/capnpc-csharp.1.0.0.nuspec

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
+  <metadata>
+    <id>capnpc-csharp</id>
+    <version>1.0.0</version>
+    <authors>Christian Köllner and contributors</authors>
+    <owners>Christian Köllner and contributors</owners>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <!--<license type="expression">MIT</license>-->
+    <licenseUrl>https://licenses.nuget.org/MIT</licenseUrl>
+    <projectUrl>https://github.com/c80k/capnproto-dotnetcore</projectUrl>
+    <description>Cap'n Proto C# code generator backend</description>
+    <copyright>Christian Köllner and contributors</copyright>
+    <tags>capnp capnpc RPC serialization cerealization</tags>
+    <!--<repository type="Git" />-->
+  </metadata>
+<files>
+    <file src="chocolateyinstall.ps1" target="tools" />
+    <file src="chocolateyuninstall.ps1" target="tools" />
+    <file src=".\deploy\**" target="tools" />
+  </files>
+</package>

chocolatey/chocolateyinstall.ps1

@@ -0,0 +1,5 @@
+$ErrorActionPreference = 'Stop'
+
+$toolsDir   = "$(Split-Path -parent $MyInvocation.MyCommand.Definition)"
+
+Install-Binfile -Name capnpc-csharp -Path "$toolsDir\capnpc-csharp.exe"

chocolatey/chocolateyuninstall.ps1

@@ -0,0 +1,3 @@
+$ErrorActionPreference = 'Stop'
+
+Uninstall-BinFile capnpc-sharp

chocolatey/deploy/capnpc-csharp.runtimeconfig.json

@@ -0,0 +1,3 @@
+{
+  "runtimeOptions": {}
+}

scripts/capnpc-csharp-install.ps1

@@ -0,0 +1,8 @@
+$id = "capnpc-csharp"
+
+$scriptDir = Split-Path -Parent $MyInvocation.MyCommand.Path
+$installDir = "$scriptDir\..\chocolatey\install"
+
+if (!([Security.Principal.WindowsPrincipal][Security.Principal.WindowsIdentity]::GetCurrent()).IsInRole([Security.Principal.WindowsBuiltInRole] "Administrator")) { Start-Process powershell.exe "-NoProfile -ExecutionPolicy Bypass -File `"$PSCommandPath`"" -Verb RunAs; exit }
+
+choco install $id -s $installDir --force

scripts/capnpc-csharp-pack.ps1

@@ -0,0 +1,14 @@
+$id = "capnpc-csharp"
+$version = "1.0.0"
+$scriptDir = Split-Path -Parent $MyInvocation.MyCommand.Path
+$prefix = "$id.$version"
+$chocoDir = "$scriptDir\..\chocolatey"
+$nuspecFile = "$prefix.nuspec"
+$nuspecPath = "$chocoDir\$nuspecFile"
+$deployDir = "$chocoDir\deploy"
+$installDir = "$chocoDir\install"
+$csprojDir = "$scriptDir\..\capnpc-csharp"
+$csprojFile = "capnpc-csharp.csproj"
+
+dotnet publish -c Release -r win-x86 --self-contained -o $deployDir "$csprojDir\$csprojFile"
+choco pack $nuspecPath --outputdirectory $installDir