Skip to content

Allow to load certificate from memory #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow to load certificate from memory #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 34 additions & 0 deletions CyberSource/Client/BaseClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using CyberSource.Base;
using System;
using System.Net;
using System.Security.Cryptography.X509Certificates;
using System.ServiceModel;
using System.Xml.Serialization;
using System.ServiceModel.Channels;
Expand Down Expand Up @@ -359,5 +360,38 @@ protected static CustomBinding getWCFCustomBinding(Configuration config)
currentBinding.Elements.Add(httpsTransport);
return currentBinding;
}

/// <summary>
/// Creates a new instance of X509Certificate2
/// </summary>
/// <param name="config">
/// Configuration object containing the key content or file path
/// </param>
/// <returns>New instance of X509Certificate2</returns>
protected static X509Certificate2 GetCertificate(Configuration config)
{
var flags = X509KeyStorageFlags.Exportable | X509KeyStorageFlags.PersistKeySet;
return config.Key != null
? new X509Certificate2(config.Key, config.EffectivePassword, flags)
: new X509Certificate2(config.EffectiveKeyFilePath, config.EffectivePassword, flags);
}

/// <summary>
/// Creates a certificate collection with an imported certificate
/// </summary>
/// <param name="config">
/// Configuration object containing the key content or file path
/// </param>
/// <returns>New instance of X509Certificate2Collection with an imported certificate</returns>
protected static X509Certificate2Collection GetCertificateCollection(Configuration config)
{
var collection = new X509Certificate2Collection();
var flags = X509KeyStorageFlags.Exportable | X509KeyStorageFlags.PersistKeySet;
if (config.Key != null)
collection.Import(config.Key, config.EffectivePassword, flags);
else
collection.Import(config.EffectiveKeyFilePath, config.EffectivePassword, flags);
return collection;
}
}
}
23 changes: 23 additions & 0 deletions CyberSource/Client/Configuration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System;
using System.IO;

namespace CyberSource.Clients
{
Expand Down Expand Up @@ -62,6 +63,7 @@ public class Configuration
private string logDirectory = null;
private string serverURL = null;
private string keyFilename = null;
private byte[] key = null;
private string password = null;
private string logFilename = null;
private int logMaximumSize = -1;
Expand Down Expand Up @@ -161,6 +163,15 @@ public string ServerURL
set { serverURL = value; }
}

/// <summary>
/// This is optional. When set, it reads key from memory rather than from file system
/// </summary>
public byte[] Key
{
get { return key; }
set { key = value; }
}

/// <summary>
/// Corresponds to [cybs.][merchantID].keyFilename.
///
Expand Down Expand Up @@ -380,6 +391,18 @@ internal string EffectiveKeyFilename
}
}

/// <summary>
/// Return the key file path that will take effect given
/// the current state of this Configuration object.
/// </summary>
internal string EffectiveKeyFilePath
{
get
{
return Path.Combine(KeysDirectory, EffectiveKeyFilename);
}
}

/// <summary>
/// Returns the password that will take effect given
/// the current state of this Configuration object.
Expand Down
5 changes: 2 additions & 3 deletions CyberSource/Client/NVPClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,13 +80,12 @@ public static Hashtable RunTransaction(


string keyFilePath = Path.Combine(config.KeysDirectory, config.EffectiveKeyFilename);
proc.ClientCredentials.ClientCertificate.Certificate = new X509Certificate2(keyFilePath, config.EffectivePassword, X509KeyStorageFlags.Exportable | X509KeyStorageFlags.PersistKeySet);
proc.ClientCredentials.ClientCertificate.Certificate = GetCertificate(config);

proc.ClientCredentials.ServiceCertificate.Authentication.CertificateValidationMode = System.ServiceModel.Security.X509CertificateValidationMode.None;

// Changes for SHA2 certificates support
X509Certificate2Collection collection = new X509Certificate2Collection();
collection.Import(keyFilePath, config.EffectivePassword, X509KeyStorageFlags.Exportable | X509KeyStorageFlags.PersistKeySet);
X509Certificate2Collection collection = GetCertificateCollection(config);

foreach (X509Certificate2 cert1 in collection)
{
Expand Down
14 changes: 6 additions & 8 deletions CyberSource/Client/SoapClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,15 +79,13 @@ public static ReplyMessage RunTransaction(
currentBinding.SendTimeout = timeOut;

//add certificate credentials
string keyFilePath = Path.Combine(config.KeysDirectory,config.EffectiveKeyFilename);
proc.ClientCredentials.ClientCertificate.Certificate = new X509Certificate2(keyFilePath,config.EffectivePassword, X509KeyStorageFlags.Exportable | X509KeyStorageFlags.PersistKeySet);
proc.ClientCredentials.ClientCertificate.Certificate = GetCertificate(config);

proc.ClientCredentials.ServiceCertificate.Authentication.CertificateValidationMode = System.ServiceModel.Security.X509CertificateValidationMode.None;

// Changes for SHA2 certificates support
X509Certificate2Collection collection = GetCertificateCollection(config);

proc.ClientCredentials.ServiceCertificate.Authentication.CertificateValidationMode = System.ServiceModel.Security.X509CertificateValidationMode.None;

// Changes for SHA2 certificates support
X509Certificate2Collection collection = new X509Certificate2Collection();
collection.Import(keyFilePath, config.EffectivePassword, X509KeyStorageFlags.Exportable | X509KeyStorageFlags.PersistKeySet);

foreach (X509Certificate2 cert1 in collection)
{
if (cert1.Subject.Contains(config.MerchantID))
Expand Down
4 changes: 1 addition & 3 deletions CyberSource/Client/XmlClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,13 +84,11 @@ public static XmlDocument RunTransaction(
XmlDocument doc = SoapWrap(request, nspace);

//Get the X509 cert and sign the SOAP Body
string keyFilePath = Path.Combine(config.KeysDirectory, config.EffectiveKeyFilename);

X509Certificate2 cert = null;
X509Certificate2 cybsCert = null;

X509Certificate2Collection collection = new X509Certificate2Collection();
collection.Import(keyFilePath, config.EffectivePassword, X509KeyStorageFlags.Exportable | X509KeyStorageFlags.PersistKeySet);
X509Certificate2Collection collection = GetCertificateCollection(config);

foreach (X509Certificate2 cert1 in collection)
{
Expand Down