Remove duplicate Origin authenticator interfaces

This change removes the duplicate authenticator interfaces that are
no longer needed.  The exact same interfaces exist upstream, so this
change is purely mechanical.

Signed-off-by: Monis Khan <[email protected]>

Author: enj

pkg/auth/authenticator/interfaces.go

@@ -1,34 +1,15 @@
 package authenticator
 
 import (
-	"net/http"
+	"k8s.io/apiserver/pkg/authentication/user"
 
 	"github.com/openshift/origin/pkg/auth/api"
-	"k8s.io/apiserver/pkg/authentication/user"
 )
 
-type Token interface {
-	AuthenticateToken(token string) (user.Info, bool, error)
-}
-
-type Request interface {
-	AuthenticateRequest(req *http.Request) (user.Info, bool, error)
-}
-
-type Password interface {
-	AuthenticatePassword(user, password string) (user.Info, bool, error)
-}
-
 type Assertion interface {
 	AuthenticateAssertion(assertionType, data string) (user.Info, bool, error)
 }
 
 type Client interface {
 	AuthenticateClient(client api.Client) (user.Info, bool, error)
 }
-
-type RequestFunc func(req *http.Request) (user.Info, bool, error)
-
-func (f RequestFunc) AuthenticateRequest(req *http.Request) (user.Info, bool, error) {
-	return f(req)
-}

pkg/auth/authenticator/password/allowanypassword/anyauthpassword.go

@@ -5,9 +5,10 @@ import (
 
 	"github.com/golang/glog"
 
-	authapi "github.com/openshift/origin/pkg/auth/api"
-	"github.com/openshift/origin/pkg/auth/authenticator"
+	"k8s.io/apiserver/pkg/authentication/authenticator"
 	"k8s.io/apiserver/pkg/authentication/user"
+
+	authapi "github.com/openshift/origin/pkg/auth/api"
 )
 
 // alwaysAcceptPasswordAuthenticator approves any login attempt with non-blank username and password

pkg/auth/authenticator/password/basicauthpassword/basicauthpassword.go

@@ -10,9 +10,10 @@ import (
 
 	"github.com/golang/glog"
 
-	authapi "github.com/openshift/origin/pkg/auth/api"
-	"github.com/openshift/origin/pkg/auth/authenticator"
+	"k8s.io/apiserver/pkg/authentication/authenticator"
 	"k8s.io/apiserver/pkg/authentication/user"
+
+	authapi "github.com/openshift/origin/pkg/auth/api"
 )
 
 // Authenticator uses basic auth to make a request to a JSON-returning URL.

pkg/auth/authenticator/password/denypassword/denypassword.go

@@ -1,7 +1,7 @@
 package denypassword
 
 import (
-	"github.com/openshift/origin/pkg/auth/authenticator"
+	"k8s.io/apiserver/pkg/authentication/authenticator"
 	"k8s.io/apiserver/pkg/authentication/user"
 )
 

pkg/auth/authenticator/password/htpasswd/htpasswd.go

@@ -9,10 +9,12 @@ import (
 	"strings"
 
 	"github.com/golang/glog"
-	authapi "github.com/openshift/origin/pkg/auth/api"
-	"github.com/openshift/origin/pkg/auth/authenticator"
 	"golang.org/x/crypto/bcrypt"
+
+	"k8s.io/apiserver/pkg/authentication/authenticator"
 	"k8s.io/apiserver/pkg/authentication/user"
+
+	authapi "github.com/openshift/origin/pkg/auth/api"
 )
 
 // Authenticator watches a file generated by htpasswd to validate usernames and passwords

pkg/auth/authenticator/password/keystonepassword/keystonepassword.go

@@ -9,10 +9,11 @@ import (
 	"github.com/rackspace/gophercloud"
 	"github.com/rackspace/gophercloud/openstack"
 
-	authapi "github.com/openshift/origin/pkg/auth/api"
-	"github.com/openshift/origin/pkg/auth/authenticator"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
+	"k8s.io/apiserver/pkg/authentication/authenticator"
 	"k8s.io/apiserver/pkg/authentication/user"
+
+	authapi "github.com/openshift/origin/pkg/auth/api"
 )
 
 // keystonePasswordAuthenticator uses OpenStack keystone to authenticate a user by password

pkg/auth/authenticator/password/ldappassword/ldap.go

@@ -6,13 +6,13 @@ import (
 
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/apimachinery/pkg/util/sets"
+	"k8s.io/apiserver/pkg/authentication/authenticator"
 	"k8s.io/apiserver/pkg/authentication/user"
 
 	"github.com/golang/glog"
 	"gopkg.in/ldap.v2"
 
 	authapi "github.com/openshift/origin/pkg/auth/api"
-	"github.com/openshift/origin/pkg/auth/authenticator"
 	"github.com/openshift/origin/pkg/auth/ldaputil"
 	"github.com/openshift/origin/pkg/auth/ldaputil/ldapclient"
 )

pkg/auth/authenticator/request/basicauthrequest/basicauth.go

@@ -6,10 +6,11 @@ import (
 	"net/http"
 	"strings"
 
+	"github.com/golang/glog"
+
+	"k8s.io/apiserver/pkg/authentication/authenticator"
 	"k8s.io/apiserver/pkg/authentication/user"
 
-	"github.com/golang/glog"
-	"github.com/openshift/origin/pkg/auth/authenticator"
 	"github.com/openshift/origin/pkg/auth/prometheus"
 )
 

pkg/auth/authenticator/request/paramtoken/paramtoken.go

@@ -4,7 +4,7 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/openshift/origin/pkg/auth/authenticator"
+	"k8s.io/apiserver/pkg/authentication/authenticator"
 	"k8s.io/apiserver/pkg/authentication/user"
 	"k8s.io/apiserver/pkg/util/wsstream"
 )

pkg/auth/oauth/handlers/authenticator.go

@@ -6,9 +6,11 @@ import (
 	"github.com/RangelReale/osin"
 	"github.com/golang/glog"
 
-	"github.com/openshift/origin/pkg/auth/api"
-	"github.com/openshift/origin/pkg/auth/authenticator"
+	"k8s.io/apiserver/pkg/authentication/authenticator"
 	"k8s.io/apiserver/pkg/authentication/user"
+
+	"github.com/openshift/origin/pkg/auth/api"
+	openshiftauthenticator "github.com/openshift/origin/pkg/auth/authenticator"
 )
 
 // AuthorizeAuthenticator implements osinserver.AuthorizeHandler to ensure requests are authenticated
@@ -61,12 +63,12 @@ func (h *AuthorizeAuthenticator) HandleAuthorize(ar *osin.AuthorizeRequest, resp
 // AccessAuthenticator implements osinserver.AccessHandler to ensure non-token requests are authenticated
 type AccessAuthenticator struct {
 	password  authenticator.Password
-	assertion authenticator.Assertion
-	client    authenticator.Client
+	assertion openshiftauthenticator.Assertion
+	client    openshiftauthenticator.Client
 }
 
 // NewAccessAuthenticator returns a new AccessAuthenticator
-func NewAccessAuthenticator(password authenticator.Password, assertion authenticator.Assertion, client authenticator.Client) *AccessAuthenticator {
+func NewAccessAuthenticator(password authenticator.Password, assertion openshiftauthenticator.Assertion, client openshiftauthenticator.Client) *AccessAuthenticator {
 	return &AccessAuthenticator{password, assertion, client}
 }
 

pkg/auth/server/grant/grant.go

@@ -7,13 +7,14 @@ import (
 	"path"
 	"strings"
 
+	"github.com/golang/glog"
+
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
+	"k8s.io/apiserver/pkg/authentication/authenticator"
 	"k8s.io/apiserver/pkg/authentication/serviceaccount"
 	"k8s.io/apiserver/pkg/authentication/user"
 
-	"github.com/golang/glog"
-	"github.com/openshift/origin/pkg/auth/authenticator"
 	"github.com/openshift/origin/pkg/auth/server/csrf"
 	"github.com/openshift/origin/pkg/auth/server/headers"
 	scopeauthorizer "github.com/openshift/origin/pkg/authorization/authorizer/scope"

pkg/auth/server/login/login.go

@@ -11,8 +11,8 @@ import (
 	"github.com/golang/glog"
 
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
+	"k8s.io/apiserver/pkg/authentication/authenticator"
 
-	"github.com/openshift/origin/pkg/auth/authenticator"
 	"github.com/openshift/origin/pkg/auth/oauth/handlers"
 	"github.com/openshift/origin/pkg/auth/prometheus"
 	"github.com/openshift/origin/pkg/auth/server/csrf"