updated for ssl support & improved pgp support

adlnet-archive · Mar 6, 2012 · 87f3f9a · 87f3f9a
1 parent de75ff9
commit 87f3f9a
Show file tree

Hide file tree

Showing 16 changed files with 1,474 additions and 1,359 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,5 @@
 ConsoleApplication1
+*.suo
+*.pidb
+*.userprefs
+*.user
diff --git a/CsvToLrWindow.cs b/CsvToLrWindow.cs
@@ -186,6 +186,7 @@ private lr_Envelope buildEnvelopeFromMapping()
 		{
 			signer = new PgpSigner(sigInfo.PgpPublicKeyLocations,
 			                       sigInfo.PgpKeyringLocation,
+			                       sigInfo.PgpSecretKeyUsername,
 			                       sigInfo.PgpSecretKeyPassphrase);
 			needToSign = true;
 		}

diff --git a/LR.Net b/LR.Net
diff --git a/MainWindow.cs b/MainWindow.cs
@@ -59,6 +59,7 @@ protected void PublishDocument (object sender, System.EventArgs e)
 			{
 				PgpSigner signer = new PgpSigner(sigInfo.PgpPublicKeyLocations,
 				                                 sigInfo.PgpKeyringLocation,
+				                                 sigInfo.PgpSecretKeyUsername,
 				                                 sigInfo.PgpSecretKeyPassphrase);
 
 				doc = signer.Sign(doc);
@@ -95,6 +96,7 @@ protected void PublishDocument (object sender, System.EventArgs e)
 				WriteLineToConsole("Publish failed! Reason:\n"+exception.Message);
 				WriteToConsole("Stack Trace:\n" + exception.StackTrace);
 			}
+			WriteLineToConsole("\n========END PUBLISH ATTEMPT========");
 		} 
 		else
 			ShowMissingFields();

diff --git a/NodeInfoWidget.cs b/NodeInfoWidget.cs
@@ -12,11 +12,11 @@ public string NodeUrl
 	{
 		get 
 		{ 
-			return "http://"+this.NodeUrlTextBox.Text; 
+			return this.lbl_http.Text+this.NodeUrlTextBox.Text; 
 		}
 		set 
 		{
-			this.NodeUrlTextBox.Text = value.Replace("http://", "");
+			this.NodeUrlTextBox.Text = value.Replace(this.lbl_http.Text, "");
 		}
 	}
 
@@ -72,6 +72,14 @@ public void ResetFields()
 
 		return missingFields;
 	}
+
+	protected void OnUseSslCheckboxClicked (object sender, System.EventArgs e)
+	{
+		if(this.UseSslCheckbox.Active)
+			this.lbl_http.Text = "https://";
+		else
+			this.lbl_http.Text = "http://";
+	}
 }
 
 
diff --git a/PublishGUI.csproj b/PublishGUI.csproj
@@ -34,6 +34,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
+    <PlatformTarget>x86</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>none</DebugType>
@@ -43,10 +44,19 @@
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
     <PlatformTarget>x86</PlatformTarget>
+    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <PlatformTarget>x86</PlatformTarget>
+    <OutputPath>bin\x86\Debug\</OutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <PlatformTarget>x86</PlatformTarget>
+    <OutputPath>bin\x86\Release\</OutputPath>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="LumenWorks.Framework.IO">
-      <HintPath>..\..\..\..\Documents and Settings\montoyaa\My Documents\Downloads\CsvReader_bin\LumenWorks.Framework.IO.dll</HintPath>
+      <HintPath>references\LumenWorks.Framework.IO.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />

diff --git a/SignatureInformationWidget.cs b/SignatureInformationWidget.cs
@@ -10,6 +10,8 @@ public partial class SignatureInformationWidget : Gtk.Bin
 	public SignatureType SignatureType { get { return (SignatureType)this.SignatureTypeComboBox.Active; } }
 	public string PgpKeyringLocation { get { return this.PgpSecretKeyRingLocationFileChooser.Filename; } }
 	public string PgpSecretKeyPassphrase { get { return this.PgpSecretKeyPassphraseTextBox.Text; } }
+	public string PgpSecretKeyUsername { get { return this.PgpSecKeyUsernameTextBox.Text; } }
+
 	public List<string> PgpPublicKeyLocations 
 	{ 
 		get 
@@ -43,6 +45,7 @@ public void ResetFields()
 	{
 		this.SignatureTypeComboBox.Active = 0;
 		this.PgpPublicKeyLocationsTextBox.Text = String.Empty;
+		this.PgpSecKeyUsernameTextBox.Text = String.Empty;
 		this.PgpSecretKeyPassphraseTextBox.Text = String.Empty;
 		this.PgpSecretKeyRingLocationFileChooser.UnselectAll();
 		UpdateSubcontainerVisibility(this, null);
@@ -56,6 +59,9 @@ public void ResetFields()
 			if(String.IsNullOrEmpty(this.PgpSecretKeyRingLocationFileChooser.Filename))
 				missingFields.Add(this.lbl_PgpSecretKeyRingLocation);
 
+			if(String.IsNullOrEmpty(this.PgpSecKeyUsernameTextBox.Text))
+				missingFields.Add(this.lbl_PgpSecKeyUsername);
+
 			if(String.IsNullOrEmpty(this.PgpSecretKeyPassphraseTextBox.Text))
 				missingFields.Add(this.lbl_PgpSecretKeyPassphrase);
 

diff --git a/gtk-gui/CsvToLrMapRow.cs b/gtk-gui/CsvToLrMapRow.cs
@@ -1,68 +1,68 @@
-
-// This file has been generated by the GUI designer. Do not modify.
-
-public partial class CsvToLrMapRow
-{
-	private global::Gtk.HBox RowContainer;
-	private global::Gtk.Label lbl_ResourceDataField;
-	private global::Gtk.Label lbl_MapsTo;
-	private global::Gtk.ComboBox ColumnOptionsComboBox;
-	private global::Gtk.Entry CustomValueEntry;
-
-	protected virtual void Build ()
-	{
-		global::Stetic.Gui.Initialize (this);
-		// Widget CsvToLrMapRow
-		global::Stetic.BinContainer.Attach (this);
-		this.Name = "CsvToLrMapRow";
-		// Container child CsvToLrMapRow.Gtk.Container+ContainerChild
-		this.RowContainer = new global::Gtk.HBox ();
-		this.RowContainer.Name = "RowContainer";
-		this.RowContainer.Spacing = 6;
-		// Container child RowContainer.Gtk.Box+BoxChild
-		this.lbl_ResourceDataField = new global::Gtk.Label ();
-		this.lbl_ResourceDataField.WidthRequest = 200;
-		this.lbl_ResourceDataField.Name = "lbl_ResourceDataField";
-		this.lbl_ResourceDataField.Xpad = 5;
-		this.lbl_ResourceDataField.Xalign = 0F;
-		this.RowContainer.Add (this.lbl_ResourceDataField);
-		global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.RowContainer [this.lbl_ResourceDataField]));
-		w1.Position = 0;
-		w1.Expand = false;
-		w1.Fill = false;
-		// Container child RowContainer.Gtk.Box+BoxChild
-		this.lbl_MapsTo = new global::Gtk.Label ();
-		this.lbl_MapsTo.Name = "lbl_MapsTo";
-		this.lbl_MapsTo.LabelProp = global::Mono.Unix.Catalog.GetString ("Maps To:");
-		this.RowContainer.Add (this.lbl_MapsTo);
-		global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.RowContainer [this.lbl_MapsTo]));
-		w2.Position = 1;
-		w2.Expand = false;
-		w2.Fill = false;
-		// Container child RowContainer.Gtk.Box+BoxChild
-		this.ColumnOptionsComboBox = global::Gtk.ComboBox.NewText ();
-		this.ColumnOptionsComboBox.Name = "ColumnOptionsComboBox";
-		this.RowContainer.Add (this.ColumnOptionsComboBox);
-		global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.RowContainer [this.ColumnOptionsComboBox]));
-		w3.Position = 2;
-		w3.Expand = false;
-		w3.Fill = false;
-		// Container child RowContainer.Gtk.Box+BoxChild
-		this.CustomValueEntry = new global::Gtk.Entry ();
-		this.CustomValueEntry.CanFocus = true;
-		this.CustomValueEntry.Name = "CustomValueEntry";
-		this.CustomValueEntry.IsEditable = true;
-		this.CustomValueEntry.InvisibleChar = '●';
-		this.RowContainer.Add (this.CustomValueEntry);
-		global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.RowContainer [this.CustomValueEntry]));
-		w4.Position = 3;
-		w4.Padding = ((uint)(5));
-		this.Add (this.RowContainer);
-		if ((this.Child != null)) {
-			this.Child.ShowAll ();
-		}
-		this.CustomValueEntry.Hide ();
-		this.Hide ();
-		this.ColumnOptionsComboBox.Changed += new global::System.EventHandler (this.OnColumnSelectionChanged);
-	}
-}
+
+// This file has been generated by the GUI designer. Do not modify.
+
+public partial class CsvToLrMapRow
+{
+	private global::Gtk.HBox RowContainer;
+	private global::Gtk.Label lbl_ResourceDataField;
+	private global::Gtk.Label lbl_MapsTo;
+	private global::Gtk.ComboBox ColumnOptionsComboBox;
+	private global::Gtk.Entry CustomValueEntry;
+
+	protected virtual void Build ()
+	{
+		global::Stetic.Gui.Initialize (this);
+		// Widget CsvToLrMapRow
+		global::Stetic.BinContainer.Attach (this);
+		this.Name = "CsvToLrMapRow";
+		// Container child CsvToLrMapRow.Gtk.Container+ContainerChild
+		this.RowContainer = new global::Gtk.HBox ();
+		this.RowContainer.Name = "RowContainer";
+		this.RowContainer.Spacing = 6;
+		// Container child RowContainer.Gtk.Box+BoxChild
+		this.lbl_ResourceDataField = new global::Gtk.Label ();
+		this.lbl_ResourceDataField.WidthRequest = 200;
+		this.lbl_ResourceDataField.Name = "lbl_ResourceDataField";
+		this.lbl_ResourceDataField.Xpad = 5;
+		this.lbl_ResourceDataField.Xalign = 0F;
+		this.RowContainer.Add (this.lbl_ResourceDataField);
+		global::Gtk.Box.BoxChild w1 = ((global::Gtk.Box.BoxChild)(this.RowContainer [this.lbl_ResourceDataField]));
+		w1.Position = 0;
+		w1.Expand = false;
+		w1.Fill = false;
+		// Container child RowContainer.Gtk.Box+BoxChild
+		this.lbl_MapsTo = new global::Gtk.Label ();
+		this.lbl_MapsTo.Name = "lbl_MapsTo";
+		this.lbl_MapsTo.LabelProp = global::Mono.Unix.Catalog.GetString ("Maps To:");
+		this.RowContainer.Add (this.lbl_MapsTo);
+		global::Gtk.Box.BoxChild w2 = ((global::Gtk.Box.BoxChild)(this.RowContainer [this.lbl_MapsTo]));
+		w2.Position = 1;
+		w2.Expand = false;
+		w2.Fill = false;
+		// Container child RowContainer.Gtk.Box+BoxChild
+		this.ColumnOptionsComboBox = global::Gtk.ComboBox.NewText ();
+		this.ColumnOptionsComboBox.Name = "ColumnOptionsComboBox";
+		this.RowContainer.Add (this.ColumnOptionsComboBox);
+		global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.RowContainer [this.ColumnOptionsComboBox]));
+		w3.Position = 2;
+		w3.Expand = false;
+		w3.Fill = false;
+		// Container child RowContainer.Gtk.Box+BoxChild
+		this.CustomValueEntry = new global::Gtk.Entry ();
+		this.CustomValueEntry.CanFocus = true;
+		this.CustomValueEntry.Name = "CustomValueEntry";
+		this.CustomValueEntry.IsEditable = true;
+		this.CustomValueEntry.InvisibleChar = '●';
+		this.RowContainer.Add (this.CustomValueEntry);
+		global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.RowContainer [this.CustomValueEntry]));
+		w4.Position = 3;
+		w4.Padding = ((uint)(5));
+		this.Add (this.RowContainer);
+		if ((this.Child != null)) {
+			this.Child.ShowAll ();
+		}
+		this.CustomValueEntry.Hide ();
+		this.Hide ();
+		this.ColumnOptionsComboBox.Changed += new global::System.EventHandler (this.OnColumnSelectionChanged);
+	}
+}