`domainid` int(11) NOT NULL,
`type` enum('email', 'ssl', 'http', 'dns') NOT NULL,
`info` varchar(255) NOT NULL,
+ `reping` enum('y','n') NOT NULL DEFAULT 'n',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
import javax.servlet.http.HttpSession;
import org.cacert.gigi.database.DatabaseConnection;
-import org.cacert.gigi.dbObjects.DomainPingConfiguration;
import org.cacert.gigi.dbObjects.User;
import org.cacert.gigi.localisation.Language;
import org.cacert.gigi.output.Form.CSRFException;
instance.pinger.interrupt();
}
- public static void requestReping(DomainPingConfiguration dpc) {
- instance.pinger.requestReping(dpc);
- }
-
}
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.cacert.gigi.Gigi;
import org.cacert.gigi.GigiApiException;
import org.cacert.gigi.dbObjects.Domain;
import org.cacert.gigi.dbObjects.DomainPingConfiguration;
if (dpc.getTarget() != d) {
return;
}
- System.out.println("Would now reping: " + dpc.getInfo());
+ dpc.requestReping();
+ Gigi.notifyPinger();
+ resp.sendRedirect(PATH + i);
}
if (req.getParameter("adddomain") != null) {
DomainAddForm f = Form.getForm(req, DomainAddForm.class);
import java.util.HashMap;
import org.cacert.gigi.database.DatabaseConnection;
import org.cacert.gigi.dbObjects.Domain;
-import org.cacert.gigi.dbObjects.DomainPingConfiguration;
import org.cacert.gigi.dbObjects.User;
import org.cacert.gigi.util.RandomToken;
private PreparedStatement enterPingResult;
+ private PreparedStatement updatePingStatus;
+
private KeyStore truststore;
public PingerDaemon(KeyStore truststore) {
@Override
public void run() {
try {
- searchNeededPings = DatabaseConnection.getInstance().prepare("SELECT pingconfig.*, domains.domain, domains.memid FROM pingconfig LEFT JOIN domainPinglog ON domainPinglog.configId=pingconfig.id INNER JOIN domains ON domains.id=pingconfig.domainid WHERE domainPinglog.configId IS NULL AND domains.deleted IS NULL ");
+ searchNeededPings = DatabaseConnection.getInstance().prepare("SELECT pingconfig.*, domains.domain, domains.memid FROM pingconfig LEFT JOIN domainPinglog ON domainPinglog.configId=pingconfig.id INNER JOIN domains ON domains.id=pingconfig.domainid WHERE ( pingconfig.reping='y' OR domainPinglog.configId IS NULL) AND domains.deleted IS NULL GROUP BY pingconfig.id");
enterPingResult = DatabaseConnection.getInstance().prepare("INSERT INTO domainPinglog SET configId=?, state=?, result=?, challenge=?");
+ updatePingStatus = DatabaseConnection.getInstance().prepare("UPDATE pingconfig SET reping='n' WHERE id=?");
pingers.put("email", new EmailPinger());
pingers.put("ssl", new SSLPinger(truststore));
pingers.put("http", new HTTPFetch());
token = RandomToken.generateToken(16);
config = config + ":" + token;
}
+ updatePingStatus.setInt(1, rs.getInt("id"));
+ updatePingStatus.execute();
enterPingResult.setInt(1, rs.getInt("id"));
String resp = dp.ping(Domain.getById(rs.getInt("domainid")), config, User.getById(rs.getInt("memid")));
enterPingResult.setString(2, DomainPinger.PING_STILL_PENDING == resp ? "open" : DomainPinger.PING_SUCCEDED.equals(resp) ? "success" : "failed");
}
}
- public void requestReping(DomainPingConfiguration dpc) {}
}