mirror/checktheroads-hyperglass
1
0
Fork 0
mirror of https://github.com/checktheroads/hyperglass synced 2024-05-11 05:55:08 +00:00
Code Releases Activity

fix dns resolving & default selection

Browse Source
This commit is contained in:
checktheroads
2020-01-28 18:42:28 -10:00
parent 80aec772a9
commit b5eefed064
4 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hyperglass/execution/execute.py
View File

@@ -402,6 +402,6 @@ class Execute:
params.messages.no_output, device_name=device.display_name params.messages.no_output, device_name=device.display_name
) )
log.debug(f"Output for query: {self.query}:\n{output}") log.debug(f"Output for query: {self.query_data}:\n{output}")
return output return output

6
ui/components/HyperglassForm.js
View File

@@ -157,8 +157,8 @@ const HyperglassForm = React.forwardRef(
fieldAddOn={ fieldAddOn={
validFqdnQueryType && ( validFqdnQueryType && (
<ResolvedTarget <ResolvedTarget
formQueryTarget={queryTarget} queryTarget={queryTarget}
target={validFqdnQueryType} fqdnTarget={validFqdnQueryType}
setTarget={handleChange} setTarget={handleChange}
/> />
) )
@@ -173,7 +173,7 @@ const HyperglassForm = React.forwardRef(
)} )}
value={queryTarget} value={queryTarget}
setFqdn={setFqdnTarget} setFqdn={setFqdnTarget}
setValue={handleChange} setTarget={handleChange}
displayValue={displayTarget} displayValue={displayTarget}
setDisplayValue={setDisplayTarget} setDisplayValue={setDisplayTarget}
/> />

4
ui/components/QueryTarget.js
View File

@@ -21,7 +21,7 @@ const QueryTarget = ({
setFqdn, setFqdn,
name, name,
value, value,
setValue, setTarget,
resolveTarget, resolveTarget,
displayValue, displayValue,
setDisplayValue setDisplayValue
@@ -37,7 +37,7 @@ const QueryTarget = ({
}; };
const handleChange = e => { const handleChange = e => {
setDisplayValue(e.target.value); setDisplayValue(e.target.value);
setValue({ field: name, value: e.target.value }); setTarget({ field: name, value: e.target.value });
}; };
const handleKeyDown = e => { const handleKeyDown = e => {
if ([9, 13].includes(e.keyCode)) { if ([9, 13].includes(e.keyCode)) {

19
ui/components/ResolvedTarget.js
View File

@@ -9,19 +9,19 @@ format.extend(String.prototype, {});
const labelBg = { dark: "secondary", light: "secondary" }; const labelBg = { dark: "secondary", light: "secondary" };
const labelBgSuccess = { dark: "success", light: "success" }; const labelBgSuccess = { dark: "success", light: "success" };
const ResolvedTarget = React.forwardRef(({ target, setTarget, formQueryTarget }, ref) => { const ResolvedTarget = React.forwardRef(({ fqdnTarget, setTarget, queryTarget }, ref) => {
const { colorMode } = useColorMode(); const { colorMode } = useColorMode();
const config = useConfig(); const config = useConfig();
const labelBgStatus = { true: labelBgSuccess[colorMode], false: labelBg[colorMode] }; const labelBgStatus = { true: labelBgSuccess[colorMode], false: labelBg[colorMode] };
const params4 = { const params4 = {
url: "https://cloudflare-dns.com/dns-query", url: "https://cloudflare-dns.com/dns-query",
params: { name: target, type: "A" }, params: { name: fqdnTarget, type: "A" },
headers: { accept: "application/dns-json" }, headers: { accept: "application/dns-json" },
timeout: 1000 timeout: 1000
}; };
const params6 = { const params6 = {
url: "https://cloudflare-dns.com/dns-query", url: "https://cloudflare-dns.com/dns-query",
params: { name: target, type: "AAAA" }, params: { name: fqdnTarget, type: "AAAA" },
headers: { accept: "application/dns-json" }, headers: { accept: "application/dns-json" },
timeout: 1000 timeout: 1000
}; };
@@ -39,20 +39,17 @@ const ResolvedTarget = React.forwardRef(({ target, setTarget, formQueryTarget },
}; };
const isSelected = value => { const isSelected = value => {
console.log("value: ", value, "formQuerytarget: ", formQueryTarget, "target: ", target); return labelBgStatus[value === queryTarget];
return labelBgStatus[value === formQueryTarget];
}; };
useEffect(() => { useEffect(() => {
if (data6 && data6.Answer && data6.Answer[0].type === 28 && data === "") { if (data6 && data6.Answer && data6.Answer[0].type === 28) {
handleOverride(data6.Answer[0].data); handleOverride(data6.Answer[0].data);
} } else if (data4 && data4.Answer && data4.Answer[0].type === 1 && !data6?.Answer) {
}, [data6, data]);
useEffect(() => {
if (data4 && data4.Answer && data4.Answer[0].type === 28 && data === "") {
handleOverride(data4.Answer[0].data); handleOverride(data4.Answer[0].data);
} }
}, [data4, data]); }, [data4, data6, data]);
return ( return (
<Stack <Stack
ref={ref} ref={ref}