diff options
author | Anton Tananaev <anton@traccar.org> | 2022-06-22 07:02:42 -0700 |
---|---|---|
committer | Anton Tananaev <anton@traccar.org> | 2022-06-22 07:02:42 -0700 |
commit | f5a9207393463879cfe85e94259ee70d6d5b9980 (patch) | |
tree | ef2a00dfc706a29ad3adc9e27a83847ff1243b9d | |
parent | 009e19b44c5becefb0cb84777c2db62bf1d5005e (diff) | |
download | trackermap-server-f5a9207393463879cfe85e94259ee70d6d5b9980.tar.gz trackermap-server-f5a9207393463879cfe85e94259ee70d6d5b9980.tar.bz2 trackermap-server-f5a9207393463879cfe85e94259ee70d6d5b9980.zip |
Support service admin account
-rw-r--r-- | src/main/java/org/traccar/api/resource/SessionResource.java | 2 | ||||
-rw-r--r-- | src/main/java/org/traccar/api/security/LoginService.java (renamed from src/main/java/org/traccar/database/LoginService.java) | 8 | ||||
-rw-r--r-- | src/main/java/org/traccar/api/security/PermissionsService.java | 8 | ||||
-rw-r--r-- | src/main/java/org/traccar/api/security/SecurityRequestFilter.java | 1 | ||||
-rw-r--r-- | src/main/java/org/traccar/api/security/ServiceAccountUser.java | 30 | ||||
-rw-r--r-- | src/main/java/org/traccar/config/Keys.java | 8 |
6 files changed, 52 insertions, 5 deletions
diff --git a/src/main/java/org/traccar/api/resource/SessionResource.java b/src/main/java/org/traccar/api/resource/SessionResource.java index 70561f997..91052fc6b 100644 --- a/src/main/java/org/traccar/api/resource/SessionResource.java +++ b/src/main/java/org/traccar/api/resource/SessionResource.java @@ -16,7 +16,7 @@ package org.traccar.api.resource; import org.traccar.api.BaseResource; -import org.traccar.database.LoginService; +import org.traccar.api.security.LoginService; import org.traccar.helper.DataConverter; import org.traccar.helper.ServletHelper; import org.traccar.helper.LogAction; diff --git a/src/main/java/org/traccar/database/LoginService.java b/src/main/java/org/traccar/api/security/LoginService.java index 2c541e2aa..9938cf6dc 100644 --- a/src/main/java/org/traccar/database/LoginService.java +++ b/src/main/java/org/traccar/api/security/LoginService.java @@ -13,10 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.traccar.database; +package org.traccar.api.security; import org.traccar.config.Config; import org.traccar.config.Keys; +import org.traccar.database.LdapProvider; import org.traccar.model.User; import org.traccar.storage.Storage; import org.traccar.storage.StorageException; @@ -32,16 +33,21 @@ public class LoginService { private final Storage storage; private final LdapProvider ldapProvider; + private final String serviceAccountToken; private final boolean forceLdap; @Inject public LoginService(Config config, Storage storage, @Nullable LdapProvider ldapProvider) { this.storage = storage; this.ldapProvider = ldapProvider; + serviceAccountToken = config.getString(Keys.WEB_SERVICE_ACCOUNT_TOKEN); forceLdap = config.getBoolean(Keys.LDAP_FORCE); } public User login(String token) throws StorageException { + if (serviceAccountToken != null && serviceAccountToken.equals(token)) { + return new ServiceAccountUser(); + } User user = storage.getObject(User.class, new Request( new Columns.All(), new Condition.Equals("token", "token", token))); if (user != null) { diff --git a/src/main/java/org/traccar/api/security/PermissionsService.java b/src/main/java/org/traccar/api/security/PermissionsService.java index ea7a9d572..e5bc52f22 100644 --- a/src/main/java/org/traccar/api/security/PermissionsService.java +++ b/src/main/java/org/traccar/api/security/PermissionsService.java @@ -58,8 +58,12 @@ public class PermissionsService { public User getUser(long userId) throws StorageException { if (user == null && userId > 0) { - user = storage.getObject( - User.class, new Request(new Columns.All(), new Condition.Equals("id", "id", userId))); + if (userId == ServiceAccountUser.ID) { + user = new ServiceAccountUser(); + } else { + user = storage.getObject( + User.class, new Request(new Columns.All(), new Condition.Equals("id", "id", userId))); + } } return user; } diff --git a/src/main/java/org/traccar/api/security/SecurityRequestFilter.java b/src/main/java/org/traccar/api/security/SecurityRequestFilter.java index 3413175c8..eaf5b28c4 100644 --- a/src/main/java/org/traccar/api/security/SecurityRequestFilter.java +++ b/src/main/java/org/traccar/api/security/SecurityRequestFilter.java @@ -18,7 +18,6 @@ package org.traccar.api.security; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.traccar.api.resource.SessionResource; -import org.traccar.database.LoginService; import org.traccar.database.StatisticsManager; import org.traccar.helper.DataConverter; import org.traccar.model.User; diff --git a/src/main/java/org/traccar/api/security/ServiceAccountUser.java b/src/main/java/org/traccar/api/security/ServiceAccountUser.java new file mode 100644 index 000000000..644142434 --- /dev/null +++ b/src/main/java/org/traccar/api/security/ServiceAccountUser.java @@ -0,0 +1,30 @@ +/* + * Copyright 2022 Anton Tananaev (anton@traccar.org) + * + * 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 org.traccar.api.security; + +import org.traccar.model.User; + +public class ServiceAccountUser extends User { + + public static final long ID = 9000000000000000000L; + + public ServiceAccountUser() { + setId(ID); + setName("Service Account"); + setEmail("none"); + setAdministrator(true); + } +} diff --git a/src/main/java/org/traccar/config/Keys.java b/src/main/java/org/traccar/config/Keys.java index a03e47022..3f52fbd96 100644 --- a/src/main/java/org/traccar/config/Keys.java +++ b/src/main/java/org/traccar/config/Keys.java @@ -674,6 +674,14 @@ public final class Keys { List.of(KeyType.CONFIG)); /** + * A token to login as a virtual admin account. Can be used to restore access in case of issues with regular admin + * login. For example, if password is lost and can't be restored. + */ + public static final ConfigKey<String> WEB_SERVICE_ACCOUNT_TOKEN = new StringConfigKey( + "web.serviceAccountToken", + List.of(KeyType.CONFIG)); + + /** * Cross-origin resource sharing origin header value. */ public static final ConfigKey<String> WEB_ORIGIN = new StringConfigKey( |