auth: Fix includes

auth/allow_all_authenticator.hh

@@ -23,8 +23,8 @@
 
 #include <stdexcept>
 
-#include "auth/authenticator.hh"
 #include "auth/authenticated_user.hh"
+#include "auth/authenticator.hh"
 #include "auth/common.hh"
 
 namespace cql3 {

auth/allow_all_authorizer.hh

@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include "authorizer.hh"
+#include "auth/authorizer.hh"
 #include "exceptions/exceptions.hh"
 #include "stdx.hh"
 

auth/authenticated_user.cc

@@ -39,7 +39,7 @@
  * along with Scylla.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "authenticated_user.hh"
+#include "auth/authenticated_user.hh"
 
 #include <iostream>
 

auth/authenticated_user.hh

@@ -45,8 +45,9 @@
 #include <functional>
 #include <iosfwd>
 #include <optional>
+
 #include <seastar/core/sstring.hh>
-#include <seastar/core/future.hh>
+
 #include "seastarx.hh"
 #include "stdx.hh"
 

auth/authenticator.cc

@@ -39,10 +39,11 @@
  * along with Scylla.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "authenticator.hh"
-#include "authenticated_user.hh"
-#include "common.hh"
-#include "password_authenticator.hh"
+#include "auth/authenticator.hh"
+
+#include "auth/authenticated_user.hh"
+#include "auth/common.hh"
+#include "auth/password_authenticator.hh"
 #include "cql3/query_processor.hh"
 #include "db/config.hh"
 #include "utils/class_registrator.hh"

auth/authenticator.hh

@@ -42,21 +42,21 @@
 #pragma once
 
 #include <memory>
-#include <unordered_map>
 #include <set>
 #include <stdexcept>
-#include <boost/any.hpp>
+#include <unordered_map>
 
-#include <seastar/core/sstring.hh>
-#include <seastar/core/future.hh>
-#include <seastar/core/shared_ptr.hh>
+#include <boost/any.hpp>
 #include <seastar/core/enum.hh>
+#include <seastar/core/future.hh>
+#include <seastar/core/sstring.hh>
+#include <seastar/core/shared_ptr.hh>
 
 #include "auth/authentication_options.hh"
+#include "auth/resource.hh"
 #include "bytes.hh"
 #include "enum_set.hh"
 #include "exceptions/exceptions.hh"
-#include "resource.hh"
 
 namespace db {
     class config;

auth/authorizer.hh

@@ -44,13 +44,11 @@
 #include <vector>
 #include <tuple>
 
-#include <experimental/optional>
 #include <seastar/core/future.hh>
 #include <seastar/core/shared_ptr.hh>
 
-#include "permission.hh"
-#include "resource.hh"
-
+#include "auth/permission.hh"
+#include "auth/resource.hh"
 #include "seastarx.hh"
 
 namespace auth {

auth/default_authorizer.cc

@@ -39,18 +39,22 @@
  * along with Scylla.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <unistd.h>
+#include "auth/default_authorizer.hh"
+
+extern "C" {
 #include <crypt.h>
-#include <random>
+#include <unistd.h>
+}
+
 #include <chrono>
+#include <random>
 
 #include <boost/algorithm/string/join.hpp>
 #include <seastar/core/reactor.hh>
 
-#include "common.hh"
-#include "default_authorizer.hh"
-#include "authenticated_user.hh"
-#include "permission.hh"
+#include "auth/authenticated_user.hh"
+#include "auth/common.hh"
+#include "auth/permission.hh"
 #include "cql3/query_processor.hh"
 #include "cql3/untyped_result_set.hh"
 #include "exceptions/exceptions.hh"

auth/default_authorizer.hh

@@ -43,7 +43,7 @@
 
 #include <functional>
 
-#include "authorizer.hh"
+#include "auth/authorizer.hh"
 #include "cql3/query_processor.hh"
 #include "service/migration_manager.hh"
 

auth/password_authenticator.cc

@@ -39,19 +39,23 @@
  * along with Scylla.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <algorithm>
-#include <unistd.h>
+#include "auth/password_authenticator.hh"
+
+extern "C" {
 #include <crypt.h>
-#include <random>
+#include <unistd.h>
+}
+
+#include <algorithm>
 #include <chrono>
+#include <random>
 
 #include <boost/algorithm/cxx11/all_of.hpp>
 #include <seastar/core/reactor.hh>
 
+#include "auth/authenticated_user.hh"
+#include "auth/common.hh"
 #include "auth/roles-metadata.hh"
-#include "common.hh"
-#include "password_authenticator.hh"
-#include "authenticated_user.hh"
 #include "cql3/untyped_result_set.hh"
 #include "log.hh"
 #include "service/migration_manager.hh"

auth/password_authenticator.hh

@@ -41,10 +41,11 @@
 
 #pragma once
 
-#include "authenticator.hh"
-#include "cql3/query_processor.hh"
 #include <seastar/core/abort_source.hh>
 
+#include "auth/authenticator.hh"
+#include "cql3/query_processor.hh"
+
 namespace service {
 class migration_manager;
 }

auth/permission.cc

@@ -39,9 +39,11 @@
  * along with Scylla.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <unordered_map>
+#include "auth/permission.hh"
+
 #include <boost/algorithm/string.hpp>
-#include "permission.hh"
+
+#include <unordered_map>
 
 const auth::permission_set auth::permissions::ALL =
                 auth::permission_set::of<auth::permission::CREATE,

auth/permission.hh

@@ -42,10 +42,11 @@
 #pragma once
 
 #include <unordered_set>
+
 #include <seastar/core/sstring.hh>
 
-#include "seastarx.hh"
 #include "enum_set.hh"
+#include "seastarx.hh"
 
 namespace auth {
 

auth/transitional.cc

@@ -39,13 +39,12 @@
  * along with Scylla.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "authenticator.hh"
-#include "authenticated_user.hh"
-#include "authenticator.hh"
-#include "authorizer.hh"
-#include "password_authenticator.hh"
-#include "default_authorizer.hh"
-#include "permission.hh"
+#include "auth/authenticated_user.hh"
+#include "auth/authenticator.hh"
+#include "auth/authorizer.hh"
+#include "auth/default_authorizer.hh"
+#include "auth/password_authenticator.hh"
+#include "auth/permission.hh"
 #include "db/config.hh"
 #include "utils/class_registrator.hh"