-
Notifications
You must be signed in to change notification settings - Fork 708
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
See https://jira.hyperledger.org/browse/FAB-1782 This changes the default listening fabric-ca port from 8888 to 7054 which is the same port as the old membership services. This was unfortunately not as trivial as you would think because the default port is buried in cfssl's cli/config.go file with no way to change the flag set. So I process the command line args prior to calling into cfssl's code to see if a "-port" option was specified. If it wasn't, then I add "-port 7054" to the command line, so to cfssl it looks like we always pass in a "-port" option. The GetCommandLineOptValue func in util/args.go may also be used to remove the "-config" option for the cli client in a future change set. Change-Id: I6caca6ab9c36a0a11d2069796cbfc18e39969faa Signed-off-by: Keith Smith <[email protected]>
- Loading branch information
Keith Smith
committed
Jan 23, 2017
1 parent
aa5fb82
commit a569df9
Showing
8 changed files
with
257 additions
and
34 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,92 @@ | ||
| /* | ||
| Copyright IBM Corp. 2017 All Rights Reserved. | ||
| 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 util | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "os" | ||
| ) | ||
|
|
||
| const ( | ||
| defaultServerProtocol = "https" | ||
| defaultServerAddr = "localhost" | ||
| defaultServerPort = "7054" | ||
| ) | ||
|
|
||
| // GetCommandLineOptValue searches the command line arguments for the | ||
| // specified option and returns the following value if found; otherwise | ||
| // it returns "". If **remove** is true and it is found, the option | ||
| // and its value are removed from os.Args. | ||
| // For example, if command line is: | ||
| // fabric-ca client enroll -config myconfig.json | ||
| // GetCommandLineOptValue("-config",true) returns "myconfig.json" | ||
| // and changes os.Args to | ||
| // fabric-ca client enroll | ||
| func GetCommandLineOptValue(optName string, remove bool) string { | ||
| for i := 0; i < len(os.Args)-1; i++ { | ||
| if os.Args[i] == optName { | ||
| val := os.Args[i+1] | ||
| if remove { | ||
| // Splice out the option and its value | ||
| os.Args = append(os.Args[:i], os.Args[i+2:]...) | ||
| } | ||
| return val | ||
| } | ||
| } | ||
| return "" | ||
| } | ||
|
|
||
| // GetServerURL returns the server's URL | ||
| func GetServerURL() string { | ||
| return fmt.Sprintf("%s://%s:%s", GetServerProtocol(), GetServerAddr(), GetServerPort()) | ||
| } | ||
|
|
||
| // GetServerProtocol returns the server's protocol | ||
| func GetServerProtocol() string { | ||
| protocol := GetCommandLineOptValue("-protocol", false) | ||
| if protocol != "" { | ||
| return protocol | ||
| } | ||
| return defaultServerProtocol | ||
| } | ||
|
|
||
| // GetServerAddr returns the server's address | ||
| func GetServerAddr() string { | ||
| addr := GetCommandLineOptValue("-address", false) | ||
| if addr != "" { | ||
| return addr | ||
| } | ||
| return defaultServerAddr | ||
| } | ||
|
|
||
| // GetServerPort returns the server's listening port | ||
| func GetServerPort() string { | ||
| port := GetCommandLineOptValue("-port", false) | ||
| if port != "" { | ||
| return port | ||
| } | ||
| return defaultServerPort | ||
| } | ||
|
|
||
| // SetDefaultServerPort overrides the default CFSSL server port | ||
| // by adding the "-port" option to the command line if it was not | ||
| // already present. | ||
| func SetDefaultServerPort() { | ||
| if len(os.Args) > 2 && GetCommandLineOptValue("-port", false) == "" { | ||
| os.Args = append(os.Args, "-port", defaultServerPort) | ||
| } | ||
| } |
Oops, something went wrong.