Revert "deprecate embedded browser (#12163)"

This reverts commit 736d8cbac4.

Bring contrib files for older contributions

pkg/event/target/kafka.go

@@ -272,16 +272,7 @@ func NewKafkaTarget(id string, args KafkaArgs, doneCh <-chan struct{}, loggerOnc
 
 	config.Net.SASL.User = args.SASL.User
 	config.Net.SASL.Password = args.SASL.Password
-	if args.SASL.Mechanism == "sha512" {
-		config.Net.SASL.SCRAMClientGeneratorFunc = func() sarama.SCRAMClient { return &XDGSCRAMClient{HashGeneratorFcn: KafkaSHA512} }
-		config.Net.SASL.Mechanism = sarama.SASLMechanism(sarama.SASLTypeSCRAMSHA512)
-	} else if args.SASL.Mechanism == "sha256" {
-		config.Net.SASL.SCRAMClientGeneratorFunc = func() sarama.SCRAMClient { return &XDGSCRAMClient{HashGeneratorFcn: KafkaSHA256} }
-		config.Net.SASL.Mechanism = sarama.SASLMechanism(sarama.SASLTypeSCRAMSHA256)
-	} else {
-		// default to PLAIN
-		config.Net.SASL.Mechanism = sarama.SASLMechanism(sarama.SASLTypePlaintext)
-	}
+	initScramClient(args, config) // initializes configured scram client.
 	config.Net.SASL.Enable = args.SASL.Enable
 
 	tlsConfig, err := saramatls.NewConfig(args.TLS.ClientTLSCert, args.TLS.ClientTLSKey)

pkg/event/target/kafka_scram_client.go

@@ -1,19 +1,18 @@
-// Copyright (c) 2015-2021 MinIO, Inc.
-//
-// This file is part of MinIO Object Storage stack
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+/*
+ * MinIO Object Storage (c) 2021 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 target
 
@@ -21,9 +20,23 @@ import (
 	"crypto/sha256"
 	"crypto/sha512"
 
+	"github.com/Shopify/sarama"
 	"github.com/xdg/scram"
 )
 
+func initScramClient(args KafkaArgs, config *sarama.Config) {
+	if args.SASL.Mechanism == "sha512" {
+		config.Net.SASL.SCRAMClientGeneratorFunc = func() sarama.SCRAMClient { return &XDGSCRAMClient{HashGeneratorFcn: KafkaSHA512} }
+		config.Net.SASL.Mechanism = sarama.SASLMechanism(sarama.SASLTypeSCRAMSHA512)
+	} else if args.SASL.Mechanism == "sha256" {
+		config.Net.SASL.SCRAMClientGeneratorFunc = func() sarama.SCRAMClient { return &XDGSCRAMClient{HashGeneratorFcn: KafkaSHA256} }
+		config.Net.SASL.Mechanism = sarama.SASLMechanism(sarama.SASLTypeSCRAMSHA256)
+	} else {
+		// default to PLAIN
+		config.Net.SASL.Mechanism = sarama.SASLMechanism(sarama.SASLTypePlaintext)
+	}
+}
+
 // KafkaSHA256 is a function that returns a crypto/sha256 hasher and should be used
 // to create Client objects configured for SHA-256 hashing.
 var KafkaSHA256 scram.HashGeneratorFcn = sha256.New

pkg/event/target/nats_contrib_test.go

@@ -1,19 +1,18 @@
-// Copyright (c) 2015-2021 MinIO, Inc.
-//
-// This file is part of MinIO Object Storage stack
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+/*
+ * MinIO Object Storage (c) 2021 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 target
 

pkg/event/target/nats_tls_contrib_test.go

@@ -0,0 +1,70 @@
+/*
+ * MinIO Object Storage (c) 2021 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 target
+
+import (
+	"path"
+	"path/filepath"
+	"testing"
+
+	xnet "github.com/minio/minio/pkg/net"
+	natsserver "github.com/nats-io/nats-server/v2/test"
+)
+
+func TestNatsConnTLSCustomCA(t *testing.T) {
+	s, opts := natsserver.RunServerWithConfig(filepath.Join("testdata", "contrib", "nats_tls.conf"))
+	defer s.Shutdown()
+
+	clientConfig := &NATSArgs{
+		Enable: true,
+		Address: xnet.Host{Name: "localhost",
+			Port:      (xnet.Port(opts.Port)),
+			IsPortSet: true},
+		Subject:       "test",
+		Secure:        true,
+		CertAuthority: path.Join("testdata", "contrib", "certs", "root_ca_cert.pem"),
+	}
+
+	con, err := clientConfig.connectNats()
+	if err != nil {
+		t.Errorf("Could not connect to nats: %v", err)
+	}
+	defer con.Close()
+}
+
+func TestNatsConnTLSClientAuthorization(t *testing.T) {
+	s, opts := natsserver.RunServerWithConfig(filepath.Join("testdata", "contrib", "nats_tls_client_cert.conf"))
+	defer s.Shutdown()
+
+	clientConfig := &NATSArgs{
+		Enable: true,
+		Address: xnet.Host{Name: "localhost",
+			Port:      (xnet.Port(opts.Port)),
+			IsPortSet: true},
+		Subject:       "test",
+		Secure:        true,
+		CertAuthority: path.Join("testdata", "contrib", "certs", "root_ca_cert.pem"),
+		ClientCert:    path.Join("testdata", "contrib", "certs", "nats_client_cert.pem"),
+		ClientKey:     path.Join("testdata", "contrib", "certs", "nats_client_key.pem"),
+	}
+
+	con, err := clientConfig.connectNats()
+	if err != nil {
+		t.Errorf("Could not connect to nats: %v", err)
+	}
+	defer con.Close()
+}

pkg/event/target/nats_tls_test.go

@@ -1,71 +0,0 @@
-// Copyright (c) 2015-2021 MinIO, Inc.
-//
-// This file is part of MinIO Object Storage stack
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-package target
-
-import (
-	"path"
-	"path/filepath"
-	"testing"
-
-	xnet "github.com/minio/minio/pkg/net"
-	natsserver "github.com/nats-io/nats-server/v2/test"
-)
-
-func TestNatsConnTLSCustomCA(t *testing.T) {
-	s, opts := natsserver.RunServerWithConfig(filepath.Join("testdata", "nats_tls.conf"))
-	defer s.Shutdown()
-
-	clientConfig := &NATSArgs{
-		Enable: true,
-		Address: xnet.Host{Name: "localhost",
-			Port:      (xnet.Port(opts.Port)),
-			IsPortSet: true},
-		Subject:       "test",
-		Secure:        true,
-		CertAuthority: path.Join("testdata", "certs", "root_ca_cert.pem"),
-	}
-
-	con, err := clientConfig.connectNats()
-	if err != nil {
-		t.Errorf("Could not connect to nats: %v", err)
-	}
-	defer con.Close()
-}
-
-func TestNatsConnTLSClientAuthorization(t *testing.T) {
-	s, opts := natsserver.RunServerWithConfig(filepath.Join("testdata", "nats_tls_client_cert.conf"))
-	defer s.Shutdown()
-
-	clientConfig := &NATSArgs{
-		Enable: true,
-		Address: xnet.Host{Name: "localhost",
-			Port:      (xnet.Port(opts.Port)),
-			IsPortSet: true},
-		Subject:       "test",
-		Secure:        true,
-		CertAuthority: path.Join("testdata", "certs", "root_ca_cert.pem"),
-		ClientCert:    path.Join("testdata", "certs", "nats_client_cert.pem"),
-		ClientKey:     path.Join("testdata", "certs", "nats_client_key.pem"),
-	}
-
-	con, err := clientConfig.connectNats()
-	if err != nil {
-		t.Errorf("Could not connect to nats: %v", err)
-	}
-	defer con.Close()
-}

pkg/s3select/csv/reader_contrib_test.go

@@ -1,19 +1,18 @@
-// Copyright (c) 2015-2021 MinIO, Inc.
-//
-// This file is part of MinIO Object Storage stack
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+/*
+ * MinIO Object Storage (c) 2021 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 csv
 

pkg/s3select/internal/parquet-go/common/common.go

@@ -23,7 +23,7 @@ import (
 	"fmt"
 	"io/ioutil"
 
-	"github.com/klauspost/compress/snappy"
+	"github.com/golang/snappy"
 	"github.com/minio/minio/pkg/s3select/internal/parquet-go/gen-go/parquet"
 	"github.com/pierrec/lz4"
 )

pkg/s3select/internal/parquet-go/compression.go

@@ -23,8 +23,8 @@ import (
 	"io/ioutil"
 	"sync"
 
+	"github.com/golang/snappy"
 	"github.com/klauspost/compress/gzip"
-	"github.com/klauspost/compress/snappy"
 	"github.com/klauspost/compress/zstd"
 	"github.com/minio/minio/pkg/s3select/internal/parquet-go/gen-go/parquet"
 	"github.com/pierrec/lz4"

pkg/s3select/sql/stringfuncs_contrib_test.go

@@ -0,0 +1,43 @@
+/*
+ * MinIO Object Storage (c) 2021 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 sql
+
+import "testing"
+
+func TestEvalSQLSubstring(t *testing.T) {
+	evalCases := []struct {
+		s           string
+		startIdx    int
+		length      int
+		resExpected string
+		errExpected error
+	}{
+		{"abcd", 1, 1, "a", nil},
+		{"abcd", -1, 1, "a", nil},
+		{"abcd", 999, 999, "", nil},
+		{"", 999, 999, "", nil},
+		{"测试abc", 1, 1, "测", nil},
+		{"测试abc", 5, 5, "c", nil},
+	}
+
+	for i, tc := range evalCases {
+		res, err := evalSQLSubstring(tc.s, tc.startIdx, tc.length)
+		if res != tc.resExpected || err != tc.errExpected {
+			t.Errorf("Eval Case %d failed: %v %v", i, res, err)
+		}
+	}
+}

pkg/s3select/sql/stringfuncs_test.go

@@ -106,27 +106,3 @@ func TestEvalSQLLike(t *testing.T) {
 		}
 	}
 }
-
-func TestEvalSQLSubstring(t *testing.T) {
-	evalCases := []struct {
-		s           string
-		startIdx    int
-		length      int
-		resExpected string
-		errExpected error
-	}{
-		{"abcd", 1, 1, "a", nil},
-		{"abcd", -1, 1, "a", nil},
-		{"abcd", 999, 999, "", nil},
-		{"", 999, 999, "", nil},
-		{"测试abc", 1, 1, "测", nil},
-		{"测试abc", 5, 5, "c", nil},
-	}
-
-	for i, tc := range evalCases {
-		res, err := evalSQLSubstring(tc.s, tc.startIdx, tc.length)
-		if res != tc.resExpected || err != tc.errExpected {
-			t.Errorf("Eval Case %d failed: %v %v", i, res, err)
-		}
-	}
-}

pkg/s3select/sql/value.go

@@ -852,25 +852,6 @@ func arrayCompare(op string, left, right []Value) (bool, error) {
 	}
 }
 
-func timestampCompare(op string, left, right time.Time) bool {
-	switch op {
-	case opLt:
-		return left.Before(right)
-	case opLte:
-		return left.Before(right) || left.Equal(right)
-	case opGt:
-		return left.After(right)
-	case opGte:
-		return left.After(right) || left.Equal(right)
-	case opEq:
-		return left.Equal(right)
-	case opIneq:
-		return !left.Equal(right)
-	}
-	// This case does not happen
-	return false
-}
-
 func isValidArithOperator(op string) bool {
 	switch op {
 	case opPlus:

pkg/s3select/sql/value_contrib.go

@@ -0,0 +1,38 @@
+/*
+ * MinIO Object Storage (c) 2021 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 sql
+
+import "time"
+
+func timestampCompare(op string, left, right time.Time) bool {
+	switch op {
+	case opLt:
+		return left.Before(right)
+	case opLte:
+		return left.Before(right) || left.Equal(right)
+	case opGt:
+		return left.After(right)
+	case opGte:
+		return left.After(right) || left.Equal(right)
+	case opEq:
+		return left.Equal(right)
+	case opIneq:
+		return !left.Equal(right)
+	}
+	// This case does not happen
+	return false
+}