Update icommands environment and account struct to add default checks…

…um scheme
cyverse · Jun 11, 2024 · 16fca4e · 16fca4e
1 parent d30dc13
commit 16fca4e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/icommands/environment.go b/icommands/environment.go
@@ -82,6 +82,7 @@ func CreateIcommandsEnvironmentManagerFromIRODSAccount(account *types.IRODSAccou
 		Username:                username,
 		Zone:                    zone,
 		DefaultResource:         account.DefaultResource,
+		DefaultHashScheme:       account.DefaultHashScheme,
 	}
 
 	if account.SSLConfiguration != nil {

diff --git a/icommands/environment_raw.go b/icommands/environment_raw.go
@@ -61,6 +61,7 @@ func getDefaultICommandsEnvironment() *ICommandsEnvironment {
 		AuthenticationScheme:    "native",
 		ClientServerNegotiation: "", // don't perform negotiation
 		ClientServerPolicy:      string(types.CSNegotiationRequireTCP),
+		DefaultHashScheme:       "SHA256",
 		EncryptionKeySize:       32,
 		EncryptionAlgorithm:     "AES-256-CBC",
 		EncryptionSaltSize:      8,
@@ -102,6 +103,7 @@ func (env *ICommandsEnvironment) ToIRODSAccount() *types.IRODSAccount {
 		ProxyZone:               env.Zone,
 		Password:                "",
 		DefaultResource:         env.DefaultResource,
+		DefaultHashScheme:       env.DefaultHashScheme,
 		PamTTL:                  types.PamTTLDefault,
 		PamToken:                "",
 		SSLConfiguration: &types.IRODSSSLConfig{

diff --git a/irods/types/account.go b/irods/types/account.go
@@ -12,6 +12,7 @@ const (
 	// PamTTLDefault is a default value for Pam TTL
 	PamTTLDefault       int    = 1
 	UsernameRegexString string = "^((\\w|[-.@])+)$"
+	HashSchemeDefault   string = "SHA256"
 )
 
 // IRODSAccount contains irods login information
@@ -28,6 +29,7 @@ type IRODSAccount struct {
 	Password                string
 	Ticket                  string
 	DefaultResource         string
+	DefaultHashScheme       string
 	PamTTL                  int
 	PamToken                string
 	SSLConfiguration        *IRODSSSLConfig
@@ -51,6 +53,7 @@ func CreateIRODSAccount(host string, port int, user string, zone string,
 		Password:                password,
 		Ticket:                  "",
 		DefaultResource:         defaultResource,
+		DefaultHashScheme:       HashSchemeDefault,
 		PamTTL:                  PamTTLDefault,
 		PamToken:                "",
 		SSLConfiguration:        nil,
@@ -77,6 +80,7 @@ func CreateIRODSAccountForTicket(host string, port int, user string, zone string
 		Password:                password,
 		Ticket:                  ticket,
 		DefaultResource:         defaultResource,
+		DefaultHashScheme:       HashSchemeDefault,
 		PamTTL:                  PamTTLDefault,
 		PamToken:                "",
 		SSLConfiguration:        nil,
@@ -104,6 +108,7 @@ func CreateIRODSProxyAccount(host string, port int, clientUser string, clientZon
 		Password:                password,
 		Ticket:                  "",
 		DefaultResource:         defaultResource,
+		DefaultHashScheme:       HashSchemeDefault,
 		PamTTL:                  PamTTLDefault,
 		PamToken:                "",
 		SSLConfiguration:        nil,
@@ -164,6 +169,11 @@ func CreateIRODSAccountFromYAML(yamlBytes []byte) (*IRODSAccount, error) {
 		defaultResource = val.(string)
 	}
 
+	defaultHashScheme := ""
+	if val, ok := y["default_hash_scheme"]; ok {
+		defaultHashScheme = val.(string)
+	}
+
 	// proxy user
 	proxyUser := make(map[string]interface{})
 	if val, ok := y["proxy_user"]; ok {
@@ -310,6 +320,7 @@ func CreateIRODSAccountFromYAML(yamlBytes []byte) (*IRODSAccount, error) {
 		Password:                proxyPassword,
 		Ticket:                  ticket,
 		DefaultResource:         defaultResource,
+		DefaultHashScheme:       defaultHashScheme,
 		PamTTL:                  pamTTL,
 		PamToken:                pamToken,
 		SSLConfiguration:        irodsSSLConfig,