Skip to content

Commit

Permalink
Fixes for dynamic CORS feature backport
Browse files Browse the repository at this point in the history
Signed-off-by: Alberto Codutti <alberto.codutti@eurotech.com>
  • Loading branch information
Coduz committed Apr 13, 2021
1 parent 31cae3e commit 285cc62
Showing 1 changed file with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
import javax.servlet.http.HttpServletResponse;

import org.eclipse.kapua.KapuaException;
import org.eclipse.kapua.app.api.core.settings.KapuaApiCoreSetting;
import org.eclipse.kapua.app.api.core.settings.KapuaApiCoreSettingKeys;
import org.eclipse.kapua.app.api.core.settings.KapuaApiSetting;
import org.eclipse.kapua.app.api.core.settings.KapuaApiSettingKeys;
import org.eclipse.kapua.commons.security.KapuaSecurityUtils;
import org.eclipse.kapua.locator.KapuaLocator;
import org.eclipse.kapua.model.id.KapuaId;
Expand Down Expand Up @@ -74,12 +74,12 @@ public class CORSResponseFilter implements Filter {
private ScheduledFuture<?> refreshTask;

private Multimap<String, KapuaId> allowedOrigins = HashMultimap.create();
private final List<String> allowedSystemOrigins = KapuaApiCoreSetting.getInstance().getList(String.class, KapuaApiCoreSettingKeys.API_CORS_ORIGINS_ALLOWED);
private final List<String> allowedSystemOrigins = KapuaApiSetting.getInstance().getList(String.class, KapuaApiSettingKeys.API_CORS_ORIGINS_ALLOWED);

@Override
public void init(FilterConfig filterConfig) {
logger.info("Initializing with FilterConfig: {}", filterConfig);
int intervalSecs = KapuaApiCoreSetting.getInstance().getInt(KapuaApiCoreSettingKeys.API_CORS_REFRESH_INTERVAL, 60);
int intervalSecs = KapuaApiSetting.getInstance().getInt(KapuaApiSettingKeys.API_CORS_REFRESH_INTERVAL, 60);
initRefreshThread(intervalSecs);
}

Expand Down

0 comments on commit 285cc62

Please sign in to comment.