Переглянути джерело

fix domain detection. allow admins to launch bubbles without verified contacts

tags/v0.1.6
Jonathan Cobb 4 роки тому
джерело
коміт
c6da21e411
2 змінених файлів з 10 додано та 5 видалено
  1. +1
    -1
      bubble-server/src/main/java/bubble/dao/cloud/BubbleDomainDAO.java
  2. +9
    -4
      bubble-server/src/main/java/bubble/service/cloud/StandardNetworkService.java

+ 1
- 1
bubble-server/src/main/java/bubble/dao/cloud/BubbleDomainDAO.java Переглянути файл

@@ -67,7 +67,7 @@ public class BubbleDomainDAO extends AccountOwnedTemplateDAO<BubbleDomain> {
return null;
}
final StringBuilder dname = new StringBuilder(parts[parts.length-1]);
for (int i=parts.length-2; i>1; i--) {
for (int i=parts.length-2; i>=1; i--) {
dname.insert(0, ".").insert(0, parts[i]);
final BubbleDomain domain = findByAccountAndId(configuration.getThisNode().getAccount(), dname.toString());
if (domain != null) return domain;


+ 9
- 4
bubble-server/src/main/java/bubble/service/cloud/StandardNetworkService.java Переглянути файл

@@ -461,13 +461,18 @@ public class StandardNetworkService implements NetworkService {

public NewNodeNotification startNetwork(BubbleNetwork network, NetLocation netLocation) {

final String accountUuid = network.getAccount();
if (configuration.paymentsEnabled()) {
final AccountPlan accountPlan = accountPlanDAO.findByAccountAndNetwork(network.getAccount(), network.getUuid());
final AccountPlan accountPlan = accountPlanDAO.findByAccountAndNetwork(accountUuid, network.getUuid());
if (accountPlan == null) throw invalidEx("err.accountPlan.notFound");
if (accountPlan.disabled()) throw invalidEx("err.accountPlan.disabled");
}
final AccountPolicy policy = policyDAO.findSingleByAccount(network.getAccount());
if (!policy.hasVerifiedAccountContacts()) {

final Account account = accountDAO.findByUuid(accountUuid);
if (account == null) throw notFoundEx(accountUuid);

final AccountPolicy policy = policyDAO.findSingleByAccount(accountUuid);
if (!policy.hasVerifiedAccountContacts() && !account.admin()) {
throw invalidEx("err.accountPlan.noVerifiedContacts");
}

@@ -494,7 +499,7 @@ public class StandardNetworkService implements NetworkService {
final CloudAndRegion cloudAndRegion = geoService.selectCloudAndRegion(network, netLocation);
final String host = network.fork() ? network.getForkHost() : newNodeHostname();
final NewNodeNotification newNodeRequest = new NewNodeNotification()
.setAccount(network.getAccount())
.setAccount(accountUuid)
.setNetwork(network.getUuid())
.setDomain(network.getDomain())
.setFork(network.fork())


Завантаження…
Відмінити
Зберегти