Make unit testable cert parsing functions. (#3863)
Bala FA
8 years ago
committed by
Harshavardhana
parent
47ac410ab0
commit
8a9852220d
@ -0,0 +1,139 @@ |
||||
/* |
||||
* Minio Cloud Storage, (C) 2015, 2016, 2017 Minio, Inc. |
||||
* |
||||
* Licensed under the Apache License, Version 2.0 (the "License"); |
||||
* you may not use this file except in compliance with the License. |
||||
* You may obtain a copy of the License at |
||||
* |
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
* |
||||
* Unless required by applicable law or agreed to in writing, software |
||||
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
* See the License for the specific language governing permissions and |
||||
* limitations under the License. |
||||
*/ |
||||
|
||||
package cmd |
||||
|
||||
import ( |
||||
"path/filepath" |
||||
"sync" |
||||
|
||||
homedir "github.com/minio/go-homedir" |
||||
"github.com/minio/mc/pkg/console" |
||||
) |
||||
|
||||
const ( |
||||
// Default minio configuration directory where below configuration files/directories are stored.
|
||||
defaultMinioConfigDir = ".minio" |
||||
|
||||
// Minio configuration file.
|
||||
minioConfigFile = "config.json" |
||||
|
||||
// Directory contains below files/directories for HTTPS configuration.
|
||||
certsDir = "certs" |
||||
|
||||
// Directory contains all CA certificates other than system defaults for HTTPS.
|
||||
certsCADir = "CAs" |
||||
|
||||
// Public certificate file for HTTPS.
|
||||
publicCertFile = "public.crt" |
||||
|
||||
// Private key file for HTTPS.
|
||||
privateKeyFile = "private.key" |
||||
) |
||||
|
||||
// ConfigDir - configuration directory with locking.
|
||||
type ConfigDir struct { |
||||
sync.Mutex |
||||
dir string |
||||
} |
||||
|
||||
// Set - saves given directory as configuration directory.
|
||||
func (config *ConfigDir) Set(dir string) { |
||||
config.Lock() |
||||
defer config.Unlock() |
||||
|
||||
config.dir = dir |
||||
} |
||||
|
||||
// Get - returns current configuration directory.
|
||||
func (config *ConfigDir) Get() string { |
||||
config.Lock() |
||||
defer config.Unlock() |
||||
|
||||
return config.dir |
||||
} |
||||
|
||||
func (config *ConfigDir) getCertsDir() string { |
||||
return filepath.Join(config.Get(), certsDir) |
||||
} |
||||
|
||||
// GetCADir - returns certificate CA directory.
|
||||
func (config *ConfigDir) GetCADir() string { |
||||
return filepath.Join(config.getCertsDir(), certsCADir) |
||||
} |
||||
|
||||
// Create - creates configuration directory tree.
|
||||
func (config *ConfigDir) Create() error { |
||||
return mkdirAll(config.GetCADir(), 0700) |
||||
} |
||||
|
||||
// GetMinioConfigFile - returns absolute path of config.json file.
|
||||
func (config *ConfigDir) GetMinioConfigFile() string { |
||||
return filepath.Join(config.Get(), minioConfigFile) |
||||
} |
||||
|
||||
// GetPublicCertFile - returns absolute path of public.crt file.
|
||||
func (config *ConfigDir) GetPublicCertFile() string { |
||||
return filepath.Join(config.getCertsDir(), publicCertFile) |
||||
} |
||||
|
||||
// GetPrivateKeyFile - returns absolute path of private.key file.
|
||||
func (config *ConfigDir) GetPrivateKeyFile() string { |
||||
return filepath.Join(config.getCertsDir(), privateKeyFile) |
||||
} |
||||
|
||||
func mustGetDefaultConfigDir() string { |
||||
homeDir, err := homedir.Dir() |
||||
if err != nil { |
||||
console.Fatalln("Unable to get home directory.", err) |
||||
} |
||||
|
||||
return filepath.Join(homeDir, defaultMinioConfigDir) |
||||
} |
||||
|
||||
var configDir = &ConfigDir{dir: mustGetDefaultConfigDir()} |
||||
|
||||
func setConfigDir(dir string) { |
||||
configDir.Set(dir) |
||||
} |
||||
|
||||
func getConfigDir() string { |
||||
return configDir.Get() |
||||
} |
||||
|
||||
func getCADir() string { |
||||
return configDir.GetCADir() |
||||
} |
||||
|
||||
func createConfigDir() error { |
||||
return configDir.Create() |
||||
} |
||||
|
||||
func getConfigFile() string { |
||||
return configDir.GetMinioConfigFile() |
||||
} |
||||
|
||||
func getPublicCertFile() string { |
||||
return configDir.GetPublicCertFile() |
||||
} |
||||
|
||||
func getPrivateKeyFile() string { |
||||
return configDir.GetPrivateKeyFile() |
||||
} |
||||
|
||||
func isConfigFileExists() bool { |
||||
return isFile(getConfigFile()) |
||||
} |
||||
@ -1,78 +0,0 @@ |
||||
/* |
||||
* Minio Cloud Storage, (C) 2015, 2016, 2017 Minio, Inc. |
||||
* |
||||
* Licensed under the Apache License, Version 2.0 (the "License"); |
||||
* you may not use this file except in compliance with the License. |
||||
* You may obtain a copy of the License at |
||||
* |
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
* |
||||
* Unless required by applicable law or agreed to in writing, software |
||||
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
* See the License for the specific language governing permissions and |
||||
* limitations under the License. |
||||
*/ |
||||
|
||||
package cmd |
||||
|
||||
import ( |
||||
"path/filepath" |
||||
"sync" |
||||
|
||||
homedir "github.com/minio/go-homedir" |
||||
"github.com/minio/mc/pkg/console" |
||||
) |
||||
|
||||
// ConfigDir - configuration directory with locking.
|
||||
type ConfigDir struct { |
||||
sync.Mutex |
||||
dir string |
||||
} |
||||
|
||||
// Set - saves given directory as configuration directory.
|
||||
func (config *ConfigDir) Set(dir string) { |
||||
config.Lock() |
||||
defer config.Unlock() |
||||
|
||||
config.dir = dir |
||||
} |
||||
|
||||
// Get - returns current configuration directory.
|
||||
func (config *ConfigDir) Get() string { |
||||
config.Lock() |
||||
defer config.Unlock() |
||||
|
||||
return config.dir |
||||
} |
||||
|
||||
func mustGetDefaultConfigDir() string { |
||||
homeDir, err := homedir.Dir() |
||||
if err != nil { |
||||
console.Fatalln("Unable to get home directory.", err) |
||||
} |
||||
|
||||
return filepath.Join(homeDir, globalMinioConfigDir) |
||||
} |
||||
|
||||
var configDir = &ConfigDir{dir: mustGetDefaultConfigDir()} |
||||
|
||||
func setConfigDir(dir string) { |
||||
configDir.Set(dir) |
||||
} |
||||
|
||||
func getConfigDir() string { |
||||
return configDir.Get() |
||||
} |
||||
|
||||
func createConfigDir() error { |
||||
return mkdirAll(getConfigDir(), 0700) |
||||
} |
||||
|
||||
func getConfigFile() string { |
||||
return filepath.Join(getConfigDir(), globalMinioConfigFile) |
||||
} |
||||
|
||||
func isConfigFileExists() bool { |
||||
return isFile(getConfigFile()) |
||||
} |
||||
Loading…
Reference in new issue