13049117251

Committed 30 Jan 2025 09:15AM UTC coverage: 76.848% (-0.3%) from 77.161%

Build # 13049117251

Build Type

Pull #10731

github

Committed by

web-flow

Commit Message

Merge 999fc935b into fc230b6ff

Pull Request Pull Request #10731: Fix #10631 New MapStore Home Page

Run Details

31097 of 48599 branches covered (63.99%)

849 of 1323 new or added lines in 74 files covered. (64.17%)

13 existing lines in 5 files now uncovered.

38630 of 50268 relevant lines covered (76.85%)

34.4 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

66.67

/web/client/components/misc/SecureImage.jsx

/**
 * Copyright 2024, 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 React, { useEffect, useState } from 'react';
import axios from 'axios';

import { getAuthKeyParameter, getAuthenticationMethod, getToken } from '../../utils/SecurityUtils';
import { updateUrlParams } from '../../utils/URLUtils';


const SecureImage = ({
    alt,
    src,
    ...props
}) => {
    const [imageSrc, setImageSrc] = useState('');

    // Function to validate the image once it loads
    const validateImg = (imgElement) => {
        // Implement your validation logic here
        // For example, check image dimensions, aspect ratio, etc.
        if (imgElement.naturalWidth === 0 || imgElement.naturalHeight === 0) {
            console.error('Image validation failed: Image is not valid.');
        }
    };

    useEffect(() => {
        const authMethod = getAuthenticationMethod(src);

        if (authMethod === "bearer") {
            axios.get(src, {
                responseType: 'blob'
            })
                .then((response) => {
                    const imageUrl = URL.createObjectURL(response.data);
                    setImageSrc(imageUrl);
                })
                .catch((error) => {
                    console.error('Error fetching image:', error);
                });
        } else if (authMethod === "authkey") {
            const authParam = getAuthKeyParameter(src);
            const token = getToken();
            if (authParam && token) {
                const newSrc = updateUrlParams(src, {[authParam]: token});
                setImageSrc(newSrc);
            } else {
                setImageSrc(src);
            }

        } else {
            setImageSrc(src);
        }

        // Clean up the URL object when the component unmounts
        return () => {
            if (imageSrc) {
                URL.revokeObjectURL(imageSrc);
            }
        };
    }, [src]);

    return (
        <img
            alt={alt}
            onError={(e) => {
                if (imageSrc) {
                    props.onImgError(e);
                }
            }}
            onLoad={(e) => validateImg(e.target)}
            src={imageSrc}
            style={props.style}
            {...props}
        />
    );
};

export default SecureImage;

1	/**
2	* Copyright 2024, GeoSolutions Sas.
3	* All rights reserved.
4	*
5	* This source code is licensed under the BSD-style license found in the
6	* LICENSE file in the root directory of this source tree.
7	*/
8
9	import React, { useEffect, useState } from 'react';
10	import axios from 'axios';
11
12	import { getAuthKeyParameter, getAuthenticationMethod, getToken } from '../../utils/SecurityUtils';
13	import { updateUrlParams } from '../../utils/URLUtils';
14
15
16	const SecureImage = ({	1✔
17	alt,
18	src,
19	...props
20	}) => {
21	const [imageSrc, setImageSrc] = useState('');	69✔
22
23	// Function to validate the image once it loads
24	const validateImg = (imgElement) => {	69✔
25	// Implement your validation logic here
26	// For example, check image dimensions, aspect ratio, etc.
27	if (imgElement.naturalWidth === 0 \|\| imgElement.naturalHeight === 0) {	×
UNCOV 28	console.error('Image validation failed: Image is not valid.');	×
29	}
30	};
31
32	useEffect(() => {	69✔
33	const authMethod = getAuthenticationMethod(src);	33✔
34
35	if (authMethod === "bearer") {	33!
UNCOV 36	axios.get(src, {	×
37	responseType: 'blob'
38	})
39	.then((response) => {
40	const imageUrl = URL.createObjectURL(response.data);	×
UNCOV 41	setImageSrc(imageUrl);	×
42	})
43	.catch((error) => {
UNCOV 44	console.error('Error fetching image:', error);	×
45	});
46	} else if (authMethod === "authkey") {	33✔
47	const authParam = getAuthKeyParameter(src);	3✔
48	const token = getToken();	3✔
49	if (authParam && token) {	3!
UNCOV 50	const newSrc = updateUrlParams(src, {[authParam]: token});	×
UNCOV 51	setImageSrc(newSrc);	×
52	} else {
53	setImageSrc(src);	3✔
54	}
55
56	} else {
57	setImageSrc(src);	30✔
58	}
59
60	// Clean up the URL object when the component unmounts
61	return () => {	33✔
62	if (imageSrc) {	33✔
63	URL.revokeObjectURL(imageSrc);	5✔
64	}
65	};
66	}, [src]);
67
68	return (	69✔
69	<img
70	alt={alt}
71	onError={(e) => {
72	if (imageSrc) {	13!
73	props.onImgError(e);	13✔
74	}
75	}}
UNCOV 76	onLoad={(e) => validateImg(e.target)}	×
77	src={imageSrc}
78	style={props.style}
79	{...props}
80	/>
81	);
82	};
83
84	export default SecureImage;

geosolutions-it / MapStore2 / 13049117251

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous