[release] version 0.5.6
This commit is contained in:
parent
4a8f772544
commit
3b9a7c3223
|
@ -18,6 +18,7 @@ import LogsInModal from '../../components/logsInModal';
|
||||||
import { CosmosCheckbox, CosmosInputPassword, CosmosInputText, CosmosSelect } from '../config/users/formShortcuts';
|
import { CosmosCheckbox, CosmosInputPassword, CosmosInputText, CosmosSelect } from '../config/users/formShortcuts';
|
||||||
import AnimateButton from '../../components/@extended/AnimateButton';
|
import AnimateButton from '../../components/@extended/AnimateButton';
|
||||||
import { Box } from '@mui/system';
|
import { Box } from '@mui/system';
|
||||||
|
import { pull } from 'lodash';
|
||||||
// ================================|| LOGIN ||================================ //
|
// ================================|| LOGIN ||================================ //
|
||||||
|
|
||||||
const NewInstall = () => {
|
const NewInstall = () => {
|
||||||
|
@ -27,6 +28,7 @@ const NewInstall = () => {
|
||||||
let [hostname, setHostname] = useState('');
|
let [hostname, setHostname] = useState('');
|
||||||
const [databaseEnable, setDatabaseEnable] = useState(true);
|
const [databaseEnable, setDatabaseEnable] = useState(true);
|
||||||
const [pullRequest, setPullRequest] = useState(null);
|
const [pullRequest, setPullRequest] = useState(null);
|
||||||
|
const [pullRequestOnSuccess, setPullRequestOnSuccess] = useState(null);
|
||||||
|
|
||||||
const refreshStatus = async () => {
|
const refreshStatus = async () => {
|
||||||
try {
|
try {
|
||||||
|
@ -121,6 +123,9 @@ const NewInstall = () => {
|
||||||
}}
|
}}
|
||||||
onSubmit={async (values, { setErrors, setStatus, setSubmitting }) => {
|
onSubmit={async (values, { setErrors, setStatus, setSubmitting }) => {
|
||||||
setSubmitting(true);
|
setSubmitting(true);
|
||||||
|
const submittingPromise = new Promise((resolve, reject) => {
|
||||||
|
setPullRequestOnSuccess(() => resolve);
|
||||||
|
});
|
||||||
|
|
||||||
setPullRequest(() => ((cb) => {
|
setPullRequest(() => ((cb) => {
|
||||||
API.newInstall({
|
API.newInstall({
|
||||||
|
@ -129,6 +134,8 @@ const NewInstall = () => {
|
||||||
MongoDB: values.MongoDB,
|
MongoDB: values.MongoDB,
|
||||||
}, cb)
|
}, cb)
|
||||||
}));
|
}));
|
||||||
|
|
||||||
|
return submittingPromise;
|
||||||
}}>
|
}}>
|
||||||
{(formik) => (
|
{(formik) => (
|
||||||
<form noValidate onSubmit={formik.handleSubmit}>
|
<form noValidate onSubmit={formik.handleSubmit}>
|
||||||
|
@ -141,6 +148,13 @@ const NewInstall = () => {
|
||||||
}
|
}
|
||||||
formik.setStatus({ success: true });
|
formik.setStatus({ success: true });
|
||||||
formik.setSubmitting(false);
|
formik.setSubmitting(false);
|
||||||
|
pullRequestOnSuccess();
|
||||||
|
}}
|
||||||
|
OnError={(error) => {
|
||||||
|
formik.setStatus({ success: false });
|
||||||
|
formik.setErrors({ submit: error.message });
|
||||||
|
formik.setSubmitting(false);
|
||||||
|
pullRequestOnSuccess();
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
<Stack item xs={12} spacing={2}>
|
<Stack item xs={12} spacing={2}>
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "cosmos-server",
|
"name": "cosmos-server",
|
||||||
"version": "0.5.5",
|
"version": "0.5.6",
|
||||||
"description": "",
|
"description": "",
|
||||||
"main": "test-server.js",
|
"main": "test-server.js",
|
||||||
"bugs": {
|
"bugs": {
|
||||||
|
|
|
@ -7,6 +7,7 @@ import (
|
||||||
"net/http"
|
"net/http"
|
||||||
"fmt"
|
"fmt"
|
||||||
"net"
|
"net"
|
||||||
|
"os"
|
||||||
"math"
|
"math"
|
||||||
"strconv"
|
"strconv"
|
||||||
)
|
)
|
||||||
|
@ -233,8 +234,16 @@ func calculateLowestExhaustedPercentage(policy utils.SmartShieldPolicy, userCons
|
||||||
}
|
}
|
||||||
|
|
||||||
func GetClientID(r *http.Request) string {
|
func GetClientID(r *http.Request) string {
|
||||||
ip, _, _ := net.SplitHostPort(r.RemoteAddr)
|
// when using Docker we need to get the real IP
|
||||||
|
if os.Getenv("HOSTNAME") != "" {
|
||||||
|
ip, _, _ := net.SplitHostPort(r.Header.Get("x-forwarded-for"))
|
||||||
|
utils.Debug("SmartShield: Getting client ID " + ip)
|
||||||
return ip
|
return ip
|
||||||
|
} else {
|
||||||
|
ip, _, _ := net.SplitHostPort(r.RemoteAddr)
|
||||||
|
utils.Debug("SmartShield: Getting client ID " + ip)
|
||||||
|
return ip
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func isPrivileged(req *http.Request, policy utils.SmartShieldPolicy) bool {
|
func isPrivileged(req *http.Request, policy utils.SmartShieldPolicy) bool {
|
||||||
|
|
Loading…
Reference in a new issue