Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2025-01-20 07:19:18 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

CP-12679: Upload the report from the Server Status Report wizard

Browse Source 
- make pre product key (used for authentication) configurable via registry entries

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
This commit is contained in:
Mihaela Stoica 2015-07-15 12:21:07 +01:00
parent 4490244172
commit 96f9b9c6ac
4 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
XenAdmin/Core/Registry.cs
View File

@ -314,6 +314,16 @@ namespace XenAdmin.Core
get { return ReadKey(CALL_HOME_UPLOAD_GRANT_TOKEN_DOMAIN_NAME); }
}
public static string CallHomeUploadDomainName
{
get { return ReadKey(CALL_HOME_UPLOAD_DOMAIN_NAME); }
}
public static string CallHomeProductKey
{
get { return ReadKey(CALL_HOME_PRODUCT_KEY); }
}
private const string SSL_CERTIFICATES_CHANGED_ONLY = "CHANGED";
private const string SSL_CERTIFICATES_ALL = "ALL";
private const string SSL_CERTIFICATES_KEY = "ForceSSLCertificates";
@ -332,6 +342,8 @@ namespace XenAdmin.Core
private const string CALL_HOME_IDENTITY_TOKEN_DOMAIN_NAME = "CallHomeIdentityTokenDomainName";
private const string CALL_HOME_UPLOAD_TOKEN_DOMAIN_NAME = "CallHomeUploadTokenDomainName";
private const string CALL_HOME_UPLOAD_GRANT_TOKEN_DOMAIN_NAME = "CallHomeUploadGrantTokenDomainName";
private const string CALL_HOME_UPLOAD_DOMAIN_NAME = "CallHomeUploadDomainName";
private const string CALL_HOME_PRODUCT_KEY = "CallHomeProductKey";
}
public enum SSLCertificateTypes { None, Changed, All }

2
XenAdmin/Dialogs/CallHome/CallHomeSettingsDialog.cs
View File

@ -267,7 +267,7 @@ namespace XenAdmin.Dialogs.CallHome
var action = new CallHomeAuthenticationAction(pool, textBoxMyCitrixUsername.Text.Trim(), textBoxMyCitrixPassword.Text.Trim(),
Registry.CallHomeIdentityTokenDomainName, Registry.CallHomeUploadGrantTokenDomainName, Registry.CallHomeUploadTokenDomainName,
true, 0, false);
Registry.CallHomeProductKey, true, 0, false);
try
{

3
XenAdmin/Wizards/BugToolWizardFiles/BugToolPageDestination.cs
View File

@ -183,7 +183,8 @@ namespace XenAdmin.Wizards.BugToolWizardFiles
return false;
var action = new CallHomeAuthenticationAction(null, usernameTextBox.Text.Trim(), passwordTextBox.Text.Trim(),
Registry.CallHomeIdentityTokenDomainName, Registry.CallHomeUploadGrantTokenDomainName, Registry.CallHomeUploadTokenDomainName,
Registry.CallHomeIdentityTokenDomainName, Registry.CallHomeUploadGrantTokenDomainName,
Registry.CallHomeUploadTokenDomainName, Registry.CallHomeProductKey,
false, TokenExpiration, false);
try

6
XenModel/Actions/CallHome/CallHomeAuthenticationAction.cs
View File

@ -61,7 +61,7 @@ namespace XenAdmin.Actions
private readonly string uploadGrantTokenDomainName = "http://cis-daily.citrite.com";
private readonly string uploadTokenDomainName = "http://cis-daily.citrite.com";
private const string productKey = "eb1b224c461038baf1f08dfba6b8d4b4413f96c7";
private readonly string productKey = "eb1b224c461038baf1f08dfba6b8d4b4413f96c7";
private readonly string XenServerUsername;
private readonly string XenServerPassword;
@ -84,7 +84,7 @@ namespace XenAdmin.Actions
}
public CallHomeAuthenticationAction(Pool pool, string username, string password,
string identityTokenDomainName, string uploadGrantTokenDomainName, string uploadTokenDomainName, bool saveTokenAsSecret, long tokenExpiration, bool suppressHistory)
string identityTokenDomainName, string uploadGrantTokenDomainName, string uploadTokenDomainName, string productKey, bool saveTokenAsSecret, long tokenExpiration, bool suppressHistory)
: this(pool, username, password, saveTokenAsSecret, tokenExpiration, suppressHistory)
{
if (!string.IsNullOrEmpty(identityTokenDomainName))
@ -93,6 +93,8 @@ namespace XenAdmin.Actions
this.uploadGrantTokenDomainName = uploadGrantTokenDomainName;
if (!string.IsNullOrEmpty(identityTokenDomainName))
this.uploadTokenDomainName = uploadTokenDomainName;
if (!string.IsNullOrEmpty(productKey))
this.productKey = productKey;
}
protected override void Run()