
* Drop v1beta1 from ingress nginx (#7156) * Drop v1beta1 from ingress nginx Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com> * Fix intorstr logic in controller Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com> * fixing admission Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com> * more intorstr fixing * correct template rendering Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com> * Fix e2e tests for v1 api Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com> * Fix gofmt errors * This is finally working...almost there... Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com> * Re-add removed validation of AdmissionReview * Prepare for v1.0.0-alpha.1 release Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com> * Update changelog and matrix table for v1.0.0-alpha.1 (#7274) Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com> * add docs for syslog feature (#7219) * Fix link to e2e-tests.md in developer-guide (#7201) * Use ENV expansion for namespace in args (#7146) Update the DaemonSet namespace references to use the `POD_NAMESPACE` environment variable in the same way that the Deployment does. * chart: using Helm builtin capabilities check (#7190) Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com> * Update proper default value for HTTP2MaxConcurrentStreams in Docs (#6944) It should be 128 as documented in https://github.com/kubernetes/ingress-nginx/blob/master/internal/ingress/controller/config/config.go#L780 * Fix MaxWorkerOpenFiles calculation on high cores nodes (#7107) * Fix MaxWorkerOpenFiles calculation on high cores nodes * Add e2e test for rlimit_nofile * Fix doc for max-worker-open-files * ingress/tcp: add additional error logging on failed (#7208) * Add file containing stable release (#7313) * Handle named (non-numeric) ports correctly (#7311) Signed-off-by: Carlos Panato <ctadeu@gmail.com> * Updated v1beta1 to v1 as its deprecated (#7308) * remove mercurial from build (#7031) * Retry to download maxmind DB if it fails (#7242) * Retry to download maxmind DB if it fails. Signed-off-by: Sergey Shakuto <sshakuto@infoblox.com> * Add retries count arg, move retry logic into DownloadGeoLite2DB function Signed-off-by: Sergey Shakuto <sshakuto@infoblox.com> * Reorder parameters in DownloadGeoLite2DB Signed-off-by: Sergey Shakuto <sshakuto@infoblox.com> * Remove hardcoded value Signed-off-by: Sergey Shakuto <sshakuto@infoblox.com> * Release v1.0.0-alpha.1 * Add changelog for v1.0.0-alpha.2 * controller: ignore non-service backends (#7332) * controller: ignore non-service backends Signed-off-by: Carlos Panato <ctadeu@gmail.com> * update per feedback Signed-off-by: Carlos Panato <ctadeu@gmail.com> * fix: allow scope/tcp/udp configmap namespace to altered (#7161) * Lower webhook timeout for digital ocean (#7319) * Lower webhook timeout for digital ocean * Set Digital Ocean value controller.admissionWebhooks.timeoutSeconds to 29 * update OWNERS and aliases files (#7365) (#7366) Signed-off-by: Carlos Panato <ctadeu@gmail.com> * Downgrade Lua modules for s390x (#7355) Downgrade Lua modules to last known working version. * Fix IngressClass logic for newer releases (#7341) * Fix IngressClass logic for newer releases Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com> * Change e2e tests for the new IngressClass presence * Fix chart and admission tests Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com> * Fix helm chart test Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com> * Fix reviews * Remove ingressclass code from admission * update tag to v1.0.0-beta.1 * update readme and changelog for v1.0.0-beta.1 * Release v1.0.0-beta.1 - helm and manifests (#7422) * Change the order of annotation just to trigger a new helm release (#7425) * [cherry-pick] Add dev-v1 branch into helm releaser (#7428) * Add dev-v1 branch into helm releaser (#7424) * chore: add link for artifacthub.io/prerelease annotations Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com> Co-authored-by: Ricardo Katz <rikatz@users.noreply.github.com> * k8s job ci pipeline for dev-v1 br v1.22.0 (#7453) * k8s job ci pipeline for dev-v1 br v1.22.0 Signed-off-by: Neha Lohia <nehapithadiya444@gmail.com> * k8s job ci pipeline for dev-v1 br v1.21.2 Signed-off-by: Neha Lohia <nehapithadiya444@gmail.com> * remove v1.21.1 version Signed-off-by: Neha Lohia <nehapithadiya444@gmail.com> * Add controller.watchIngressWithoutClass config option (#7459) Signed-off-by: Akshit Grover <akshit.grover2016@gmail.com> * Release new helm chart with certgen fixed (#7478) * Update go version, modules and remove ioutil * Release new helm chart with certgen fixed * changed appversion, chartversion, TAG, image (#7490) * Fix CI conflict * Fix CI conflict * Fix build.sh from rebase process * Fix controller_test post rebase Co-authored-by: Tianhao Guo <rggth09@gmail.com> Co-authored-by: Ray <61553+rctay@users.noreply.github.com> Co-authored-by: Bill Cassidy <cassid4@gmail.com> Co-authored-by: Jintao Zhang <tao12345666333@163.com> Co-authored-by: Sathish Ramani <rsathishx87@gmail.com> Co-authored-by: Mansur Marvanov <nanorobocop@gmail.com> Co-authored-by: Matt1360 <568198+Matt1360@users.noreply.github.com> Co-authored-by: Carlos Tadeu Panato Junior <ctadeu@gmail.com> Co-authored-by: Kundan Kumar <kundan.kumar@india.nec.com> Co-authored-by: Tom Hayward <thayward@infoblox.com> Co-authored-by: Sergey Shakuto <sshakuto@infoblox.com> Co-authored-by: Tore <tore.lonoy@gmail.com> Co-authored-by: Bouke Versteegh <info@boukeversteegh.nl> Co-authored-by: Shahid <shahid@us.ibm.com> Co-authored-by: James Strong <strong.james.e@gmail.com> Co-authored-by: Long Wu Yuan <longwuyuan@gmail.com> Co-authored-by: Jintao Zhang <zhangjintao9020@gmail.com> Co-authored-by: Neha Lohia <nehapithadiya444@gmail.com> Co-authored-by: Akshit Grover <akshit.grover2016@gmail.com>
213 lines
5.3 KiB
Go
213 lines
5.3 KiB
Go
/*
|
|
Copyright 2015 The Kubernetes Authors.
|
|
|
|
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 auth
|
|
|
|
import (
|
|
"fmt"
|
|
"os"
|
|
"regexp"
|
|
"strings"
|
|
|
|
"github.com/pkg/errors"
|
|
api "k8s.io/api/core/v1"
|
|
networking "k8s.io/api/networking/v1"
|
|
"k8s.io/client-go/tools/cache"
|
|
|
|
"k8s.io/ingress-nginx/internal/file"
|
|
"k8s.io/ingress-nginx/internal/ingress/annotations/parser"
|
|
ing_errors "k8s.io/ingress-nginx/internal/ingress/errors"
|
|
"k8s.io/ingress-nginx/internal/ingress/resolver"
|
|
)
|
|
|
|
var (
|
|
authTypeRegex = regexp.MustCompile(`basic|digest`)
|
|
// AuthDirectory default directory used to store files
|
|
// to authenticate request
|
|
AuthDirectory = "/etc/ingress-controller/auth"
|
|
)
|
|
|
|
const (
|
|
fileAuth = "auth-file"
|
|
mapAuth = "auth-map"
|
|
)
|
|
|
|
// Config returns authentication configuration for an Ingress rule
|
|
type Config struct {
|
|
Type string `json:"type"`
|
|
Realm string `json:"realm"`
|
|
File string `json:"file"`
|
|
Secured bool `json:"secured"`
|
|
FileSHA string `json:"fileSha"`
|
|
Secret string `json:"secret"`
|
|
SecretType string `json:"secretType"`
|
|
}
|
|
|
|
// Equal tests for equality between two Config types
|
|
func (bd1 *Config) Equal(bd2 *Config) bool {
|
|
if bd1 == bd2 {
|
|
return true
|
|
}
|
|
if bd1 == nil || bd2 == nil {
|
|
return false
|
|
}
|
|
if bd1.Type != bd2.Type {
|
|
return false
|
|
}
|
|
if bd1.Realm != bd2.Realm {
|
|
return false
|
|
}
|
|
if bd1.File != bd2.File {
|
|
return false
|
|
}
|
|
if bd1.Secured != bd2.Secured {
|
|
return false
|
|
}
|
|
if bd1.FileSHA != bd2.FileSHA {
|
|
return false
|
|
}
|
|
if bd1.Secret != bd2.Secret {
|
|
return false
|
|
}
|
|
return true
|
|
}
|
|
|
|
type auth struct {
|
|
r resolver.Resolver
|
|
authDirectory string
|
|
}
|
|
|
|
// NewParser creates a new authentication annotation parser
|
|
func NewParser(authDirectory string, r resolver.Resolver) parser.IngressAnnotation {
|
|
return auth{r, authDirectory}
|
|
}
|
|
|
|
// Parse parses the annotations contained in the ingress
|
|
// rule used to add authentication in the paths defined in the rule
|
|
// and generated an htpasswd compatible file to be used as source
|
|
// during the authentication process
|
|
func (a auth) Parse(ing *networking.Ingress) (interface{}, error) {
|
|
at, err := parser.GetStringAnnotation("auth-type", ing)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
if !authTypeRegex.MatchString(at) {
|
|
return nil, ing_errors.NewLocationDenied("invalid authentication type")
|
|
}
|
|
|
|
var secretType string
|
|
secretType, err = parser.GetStringAnnotation("auth-secret-type", ing)
|
|
if err != nil {
|
|
secretType = fileAuth
|
|
}
|
|
|
|
s, err := parser.GetStringAnnotation("auth-secret", ing)
|
|
if err != nil {
|
|
return nil, ing_errors.LocationDenied{
|
|
Reason: errors.Wrap(err, "error reading secret name from annotation"),
|
|
}
|
|
}
|
|
|
|
sns, sname, err := cache.SplitMetaNamespaceKey(s)
|
|
if err != nil {
|
|
return nil, ing_errors.LocationDenied{
|
|
Reason: errors.Wrap(err, "error reading secret name from annotation"),
|
|
}
|
|
}
|
|
|
|
if sns == "" {
|
|
sns = ing.Namespace
|
|
}
|
|
|
|
name := fmt.Sprintf("%v/%v", sns, sname)
|
|
secret, err := a.r.GetSecret(name)
|
|
if err != nil {
|
|
return nil, ing_errors.LocationDenied{
|
|
Reason: errors.Wrapf(err, "unexpected error reading secret %v", name),
|
|
}
|
|
}
|
|
|
|
realm, _ := parser.GetStringAnnotation("auth-realm", ing)
|
|
|
|
passFilename := fmt.Sprintf("%v/%v-%v-%v.passwd", a.authDirectory, ing.GetNamespace(), ing.UID, secret.UID)
|
|
|
|
switch secretType {
|
|
case fileAuth:
|
|
err = dumpSecretAuthFile(passFilename, secret)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
case mapAuth:
|
|
err = dumpSecretAuthMap(passFilename, secret)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
default:
|
|
return nil, ing_errors.LocationDenied{
|
|
Reason: errors.Wrap(err, "invalid auth-secret-type in annotation, must be 'auth-file' or 'auth-map'"),
|
|
}
|
|
}
|
|
|
|
return &Config{
|
|
Type: at,
|
|
Realm: realm,
|
|
File: passFilename,
|
|
Secured: true,
|
|
FileSHA: file.SHA1(passFilename),
|
|
Secret: name,
|
|
SecretType: secretType,
|
|
}, nil
|
|
}
|
|
|
|
// dumpSecret dumps the content of a secret into a file
|
|
// in the expected format for the specified authorization
|
|
func dumpSecretAuthFile(filename string, secret *api.Secret) error {
|
|
val, ok := secret.Data["auth"]
|
|
if !ok {
|
|
return ing_errors.LocationDenied{
|
|
Reason: errors.Errorf("the secret %v does not contain a key with value auth", secret.Name),
|
|
}
|
|
}
|
|
|
|
err := os.WriteFile(filename, val, file.ReadWriteByUser)
|
|
if err != nil {
|
|
return ing_errors.LocationDenied{
|
|
Reason: errors.Wrap(err, "unexpected error creating password file"),
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func dumpSecretAuthMap(filename string, secret *api.Secret) error {
|
|
builder := &strings.Builder{}
|
|
for user, pass := range secret.Data {
|
|
builder.WriteString(user)
|
|
builder.WriteString(":")
|
|
builder.WriteString(string(pass))
|
|
builder.WriteString("\n")
|
|
}
|
|
|
|
err := os.WriteFile(filename, []byte(builder.String()), file.ReadWriteByUser)
|
|
if err != nil {
|
|
return ing_errors.LocationDenied{
|
|
Reason: errors.Wrap(err, "unexpected error creating password file"),
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|