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

Fix async start bug(OUI), fix junk records(failover dhcp cluster) #88

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

Vatson112
Copy link

  1. When Glass starting, OUI base not loaded, cause concurency. Therefore the vendor is not defined.

  2. When you have failover dhcp cluster, there is many junk records.

1. When Glass starting, OUI base not loaded, cause concurency. Therefore the vendor is not defined.

2. When you have failover dhcp cluster, there is many junk records.
@sakers
Copy link

sakers commented Jun 22, 2021

Nice one. Works great. Shame nobody is maintaining this repo.

@wcarman1
Copy link

wcarman1 commented Dec 8, 2023

I know this is a bit old but I found a solution to the "Junk" that you get when in a failover setup. if you go into the core directory and update the lease-parser.js. I added a couple of tests to skip leases that contain "binding state free" or "binding state backup" which made it get rid of the random "undefined" leases in the table.

Just replace the core/lease-parser.js with the following and give it a shot:

module.exports = {
  parse: function (input) {
    var lease_data = input.split("lease");
    for (i = 0; i < lease_data.length; i++) {
      ip_address = "";

      lines = lease_data[i].split("\n");
      option_data = {}; // Move the declaration outside the loop

      for (l = 0; l < lines.length; l++) {
        lines[l] = lines[l].trim();
        line_data_arg = lines[l].split(" ");

        if (/{/i.test(lines[l]) && /\./i.test(lines[l]) && !/uid/i.test(lines[l])) {
          ip_address = line_data_arg[0].trim();
          if (typeof dhcp_lease_data[ip_address] === "undefined") {
            dhcp_lease_data[ip_address] = {};
          }
          option_data = {}; // Reset option_data for each lease block
        }
        if (ip_address !== "") {
          if (/start/i.test(lines[l])) {
            /*
             Make sure we force format as UTC because that is what the leases are formatted in
             */
            date = (line_data_arg[2] + ' ' + line_data_arg[3]).trim().replace(/\//gi, '-').replace(/;/i, '') + ' UTC';

            start_unix_time = (Date.parse(date) / 1000);
            dhcp_lease_data[ip_address].start = start_unix_time;
          }
          if (/ends/i.test(lines[l])) {
            /*
             Make sure we force format as UTC because that is what the leases are formatted in
             */
            lease_end = (line_data_arg[2] + ' ' + line_data_arg[3]).trim().replace(/\//gi, '-').replace(/;/i, '') + ' UTC';

            now_unix_time = parseInt((new Date().getTime() / 1000).toFixed(0));
            end_unix_time = parseInt((new Date(lease_end).getTime() / 1000).toFixed(0).toLocaleString());

            if (end_unix_time <= now_unix_time) {
              delete dhcp_lease_data[ip_address];
              break;
            }
            dhcp_lease_data[ip_address].end = end_unix_time;
          }
          if (/ethernet/i.test(lines[l])) {
            if (typeof line_data_arg[2] !== "undefined") {
              dhcp_lease_data[ip_address].mac = line_data_arg[2].replace(/;/gi, '').trim();

              if (dhcp_lease_data[ip_address].mac.split(":").join("").trim() === "")
                continue;

              if (dhcp_lease_data[ip_address].mac.split(":").join("").toUpperCase().trim() === "")
                continue;

              /* Mac OUI Lookup */
              var mac_oui = dhcp_lease_data[ip_address].mac.split(":").join("").toUpperCase().slice(0, 6);

              dhcp_lease_data[ip_address].mac_oui_vendor = '';
              if (typeof oui_data[mac_oui] !== "undefined") {
                dhcp_lease_data[ip_address].mac_oui_vendor = oui_data[mac_oui];
              }
            }
          }
          if (/hostname/i.test(lines[l])) {
            if (typeof line_data_arg[1] !== "undefined")
              dhcp_lease_data[ip_address].host = line_data_arg[1].replace(/;/gi, '').replace(/"/gi, '').trim();
          }
          if (/binding\s+state\s+(backup|free);/i.test(lines[l])) {
            // Skip the lease if it has "binding state backup;" or "binding state free;"
            delete dhcp_lease_data[ip_address];
            break;
          }
          if (/set/i.test(lines[l])) {
            set_data = lines[l].replace(/;/gi, '').replace(/"/gi, '').replace(/ = /gi, ' ').replace(/set/gi, '').trim();
            set_data_split = set_data.split(" ");

            option_key = set_data_split[0].trim();
            option_value = set_data.replace(RegExp(option_key, "g"), '').trim();

            option_data[option_key] = option_value;

            if (typeof dhcp_lease_data[ip_address]['options'] === "undefined")
              dhcp_lease_data[ip_address]['options'] = [];
          }
          if (/option/i.test(lines[l])) {
            set_data = lines[l].replace(/;/gi, '').replace(/"/gi, '').replace(/ = /gi, ' ').replace(/option/gi, '').trim();
            set_data_split = set_data.split(" ");

            option_key = set_data_split[0].trim();
            option_value = set_data.replace(RegExp(option_key, "g"), '').trim();

            option_data[option_key] = option_value;

            if (typeof dhcp_lease_data[ip_address]['options'] === "undefined")
              dhcp_lease_data[ip_address]['options'] = [];
          }
          if (lines[l].charAt(0) === "}" && typeof dhcp_lease_data[ip_address]['options'] !== "undefined") {
            if (Object.keys(option_data).length > 0) {
              dhcp_lease_data[ip_address]['options'] = option_data;
            }
          }
          /* End of Lease */
          if (lines[l].charAt(0) === "}") {
            if (debug_watch_lease_parse_stream) {
              console.log("[Glass Server] Lease Parse");
              console.log(JSON.stringify(dhcp_lease_data[ip_address], null, 2));
            }
          }
        }
      }
    }
    return;
  },
  clean: function () {
    for (var key in dhcp_lease_data) {
      now_unix_time = parseInt((new Date().getTime() / 1000).toFixed(0));
      end_unix_time = dhcp_lease_data[key].end;

      if ((now_unix_time >= end_unix_time)) {
        console.log("[DHCP Lease Data] Lease " + key + " has expired - clearing");
        delete dhcp_lease_data[key];
      }
    }
  },
};

Hope that helps!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants