Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Fixes #973] Improve LOCKDOWN_GEONODE #972

Merged
merged 5 commits into from
May 19, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions geonode_mapstore_client/client/js/api/geonode/user/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,12 @@ import { getConfigProp } from '@mapstore/framework/utils/ConfigUtils';
* @name api.geonode.user
*/

export const getUserInfo = () => {
export const getUserInfo = (apikey) => {
const { endpointV1 = '/api' } = getConfigProp('geoNodeApi') || {};
return axios.get(`${endpointV1}/o/v4/userinfo`)
return axios.get(`${endpointV1}/o/v4/userinfo`, {
params: {
...(apikey && { apikey })
}
})
.then(({ data }) => data);
};
23 changes: 17 additions & 6 deletions geonode_mapstore_client/client/js/api/geonode/v2/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@

import axios from '@mapstore/framework/libs/ajax';
import {
parseDevHostname
parseDevHostname,
getApiToken
} from '@js/utils/APIUtils';
import merge from 'lodash/merge';
import mergeWith from 'lodash/mergeWith';
Expand Down Expand Up @@ -91,7 +92,12 @@ export const setEndpoints = (data) => {
* get all thw endpoints available from API V2
*/
export const getEndpoints = () => {
return axios.get('/api/v2/')
const apikey = getApiToken();
return axios.get('/api/v2/', {
params: {
...(apikey && { apikey })
}
})
.then(({ data }) => {
setEndpoints(data);
return data;
Expand Down Expand Up @@ -413,15 +419,20 @@ export const getGroups = ({
});
};

export const getUserByPk = (pk) => {
return axios.get(parseDevHostname(`${endpoints[USERS]}/${pk}`))
export const getUserByPk = (pk, apikey) => {
return axios.get(parseDevHostname(`${endpoints[USERS]}/${pk}`), {
params: {
...(apikey && { apikey })
}
})
.then(({ data }) => data.user);
};

export const getAccountInfo = () => {
return getUserInfo()
const apikey = getApiToken();
return getUserInfo(apikey)
.then((info) => {
return getUserByPk(info.sub)
return getUserByPk(info.sub, apikey)
.then((user) => ({
...user,
info,
Expand Down
11 changes: 11 additions & 0 deletions geonode_mapstore_client/client/js/utils/APIUtils.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,17 @@ export const parseDevHostname = (requestUrl) => {
return requestUrl;
};

export const getApiToken = () => {
/*
In case of LOCKDOWN_MODE in geonode, we need to check if the search page
contains an APIKEY. This is required because otherwise the endpoint
will always raise an error due the missing auth. In this way if the
main call provide an apikey, we can proceed with the login
*/
const geoNodePageConfig = window.__GEONODE_CONFIG__ || {};
return geoNodePageConfig.apikey || null;
};

export default {
parseDevHostname
};
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,6 @@
"url": "proxy/?url=",
"useCORS": []
},
"useAuthenticationRules": true,
"authenticationRules": [
{
"urlPattern": ".*geoserver.*",
"authkeyParamName": "access_token",
"method": "authkey"
},
{
"urlPattern": ".*gs.*",
"authkeyParamName": "access_token",
"method": "authkey"
},
{
"urlPattern": ".*api/v2.*",
"method": "bearer"
}
],
"defaultLayerFormat": "image/png",
"geoNodeApi": {
"endpointV1": "/api",
"endpointV2": "/api/v2"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{% load client_lib_tags %}
{% load base_tags %}
{% load get_menu_json %}
{% load apikey %}
{% comment %}
app and map configuration need to be normalized
{% endcomment %}
Expand All @@ -12,6 +13,8 @@

{% get_menu_json 'CARDS_MENU' as CARDS_MENU %}
{{ CARDS_MENU|json_script:"menu-CARDS_MENU" }}
{% generate_proxyurl PROXY_URL|default:"/proxy/?url=" request as UPDATED_PROXY_URL %}
{% retrieve_apikey request as user_apikey %}

<script>
(function(){
Expand Down Expand Up @@ -72,11 +75,29 @@
isEmbed: isEmbed,
pluginsConfigKey: pluginsConfigKey,
pluginsConfigPatchRules: pluginsConfigPatchRules,
apikey: '{%if user_apikey %}{{user_apikey}}{% else %}{% endif %}',
localConfig: {
proxyUrl: {
url: '{{ PROXY_URL|default:"/proxy/?url=" }}',
url: '{{UPDATED_PROXY_URL|safe }}',
useCORS: []
},
useAuthenticationRules: true,
authenticationRules: [
{
urlPattern: '.*geoserver.*',
authkeyParamName: 'access_token',
method: 'authkey'
},
{
urlPattern: '.*gs.*',
authkeyParamName: 'access_token',
method: 'authkey'
},
{
urlPattern: '.*api/v2.*',
method: 'bearer'
}
],
extensionsFolder: extensionsFolder,
printUrl: geoServerPublicLocation + 'pdf/info.json',
bingApiKey: '{% bing_api_key %}',
Expand All @@ -100,7 +121,7 @@
isMobile: isMobile,
datasetMaxUploadSize: datasetMaxUploadSize,
documentMaxUploadSize: documentMaxUploadSize,
maxParallelUploads: maxParallelUploads,
maxParallelUploads: maxParallelUploads
},
geoNodeConfiguration: {
cardsMenu: {
Expand Down
38 changes: 38 additions & 0 deletions geonode_mapstore_client/templatetags/apikey.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# -*- coding: utf-8 -*-
#########################################################################
#
# Copyright 2015-2022, GeoSolutions Sas.
# All rights reserved.
#
# This source code is licensed under the BSD-style license found in the
# LICENSE file in the root directory of this source tree.
#
#########################################################################

import logging
from urllib.parse import urlparse

from django.conf import settings
from geonode.base.auth import extract_user_from_headers, get_auth_token

from django import template

logger = logging.getLogger(__name__)
register = template.Library()


@register.simple_tag()
def generate_proxyurl(_url, request):
if request:
apikey = request.GET.get('apikey')
if apikey:
pproxyurl = urlparse(_url)
proxyurl = f'{pproxyurl.path}?apikey={apikey}&{pproxyurl.query}'
return proxyurl
return _url


@register.simple_tag()
def retrieve_apikey(request):
if settings.ENABLE_APIKEY_LOGIN:
return get_auth_token(request.user) or None