-
Notifications
You must be signed in to change notification settings - Fork 4.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Libbeat's HTTP Server can now listen to unix socket. (#13655)
* Libbeat's HTTP Server can now listen to unix socket. Allow to use a socket file using the `unix:///tmp/hello.sock` syntax to define an HTTP server that will listen HTTP request.
- Loading branch information
Showing
43 changed files
with
2,010 additions
and
257 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
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,83 @@ | ||
| // Licensed to Elasticsearch B.V. under one or more contributor | ||
| // license agreements. See the NOTICE file distributed with | ||
| // this work for additional information regarding copyright | ||
| // ownership. Elasticsearch B.V. licenses this file to you 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. | ||
|
|
||
| //+build !windows | ||
|
|
||
| package api | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "net" | ||
| "os" | ||
|
|
||
| "github.com/pkg/errors" | ||
|
|
||
| "github.com/elastic/beats/libbeat/api/npipe" | ||
| ) | ||
|
|
||
| func makeListener(cfg Config) (net.Listener, error) { | ||
| if len(cfg.User) > 0 { | ||
| return nil, errors.New("specifying a user is not supported under this platform") | ||
| } | ||
|
|
||
| if len(cfg.SecurityDescriptor) > 0 { | ||
| return nil, errors.New("security_descriptor option for the HTTP endpoint only work on Windows") | ||
| } | ||
|
|
||
| if npipe.IsNPipe(cfg.Host) { | ||
| return nil, fmt.Errorf( | ||
| "cannot use %s as the host, named pipes are only supported on Windows", | ||
| cfg.Host, | ||
| ) | ||
| } | ||
|
|
||
| network, path, err := parse(cfg.Host, cfg.Port) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| if network == "unix" { | ||
| if _, err := os.Stat(path); !os.IsNotExist(err) { | ||
| if err := os.Remove(path); err != nil { | ||
| return nil, errors.Wrapf( | ||
| err, | ||
| "cannot remove existing unix socket file at location %s", | ||
| path, | ||
| ) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| l, err := net.Listen(network, path) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| // Ensure file mode | ||
| if network == "unix" { | ||
| if err := os.Chmod(path, socketFileMode); err != nil { | ||
| return nil, errors.Wrapf( | ||
| err, | ||
| "could not set mode %d for unix socket file at location %s", | ||
| socketFileMode, | ||
| path, | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| return l, nil | ||
| } |
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,64 @@ | ||
| // Licensed to Elasticsearch B.V. under one or more contributor | ||
| // license agreements. See the NOTICE file distributed with | ||
| // this work for additional information regarding copyright | ||
| // ownership. Elasticsearch B.V. licenses this file to you 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. | ||
|
|
||
| //+build windows | ||
|
|
||
| package api | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "net" | ||
|
|
||
| "github.com/pkg/errors" | ||
|
|
||
| "github.com/elastic/beats/libbeat/api/npipe" | ||
| ) | ||
|
|
||
| func makeListener(cfg Config) (net.Listener, error) { | ||
| if len(cfg.User) > 0 && len(cfg.SecurityDescriptor) > 0 { | ||
| return nil, errors.New("user and security_descriptor are mutually exclusive, define only one of them") | ||
| } | ||
|
|
||
| if npipe.IsNPipe(cfg.Host) { | ||
| pipe := npipe.TransformString(cfg.Host) | ||
| var sd string | ||
| var err error | ||
| if len(cfg.SecurityDescriptor) == 0 { | ||
| sd, err = npipe.DefaultSD(cfg.User) | ||
| if err != nil { | ||
| return nil, errors.Wrap(err, "cannot generate security descriptor for the named pipe") | ||
| } | ||
| } else { | ||
| sd = cfg.SecurityDescriptor | ||
| } | ||
| return npipe.NewListener(pipe, sd) | ||
| } | ||
|
|
||
| network, path, err := parse(cfg.Host, cfg.Port) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| if network == "unix" { | ||
| return nil, fmt.Errorf( | ||
| "cannot use %s as the host, unix sockets are not supported on Windows, use npipe instead", | ||
| cfg.Host, | ||
| ) | ||
| } | ||
|
|
||
| return net.Listen(network, path) | ||
| } |
Oops, something went wrong.