Skip to content

Fix initial old password not encrypted & bump TsFile Version #16557

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.

Sign up for GitHub

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

Merged
jt2594838 merged 3 commits into from
Oct 11, 2025
Merged

Fix initial old password not encrypted & bump TsFile Version #16557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d9852ec
Fix that the oldPassword of initial users not ecrypted
jt2594838 Oct 11, 2025
58c178a
Merge branch 'master' into fix_initial_old_password_not_enc
jt2594838 Oct 11, 2025
cda8995
bump tsfile version
jt2594838 Oct 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions integration-test/src/test/java/org/apache/iotdb/db/it/auth/IoTDBAuthIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
package org.apache.iotdb.db.it.auth;

import org.apache.iotdb.commons.auth.entity.PrivilegeType;
import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.schema.column.ColumnHeaderConstant;
import org.apache.iotdb.commons.utils.AuthUtils;
import org.apache.iotdb.db.it.utils.TestUtils;
Expand Down Expand Up @@ -1508,6 +1509,7 @@ public void testStrongPassword() throws SQLException {
public void testPasswordHistory() {
try (Connection connection = EnvFactory.getEnv().getConnection();
Statement statement = connection.createStatement()) {
testPasswordHistoryEncrypted(statement);
testPasswordHistoryCreateAndDrop(statement);
testPasswordHistoryAlter(statement);
} catch (SQLException e) {
Expand All @@ -1516,6 +1518,18 @@ public void testPasswordHistory() {
}
}

public void testPasswordHistoryEncrypted(Statement statement) throws SQLException {
ResultSet resultSet =
statement.executeQuery("SELECT password,oldPassword from root.__audit.password_history._0");
assertTrue(resultSet.next());
assertEquals(
AuthUtils.encryptPassword(CommonDescriptor.getInstance().getConfig().getAdminPassword()),
resultSet.getString("root.__audit.password_history._0.password"));
assertEquals(
AuthUtils.encryptPassword(CommonDescriptor.getInstance().getConfig().getAdminPassword()),
resultSet.getString("root.__audit.password_history._0.oldPassword"));
}

public void testPasswordHistoryCreateAndDrop(Statement statement) throws SQLException {
statement.execute("create user userA 'abcdef123456'");

Expand Down
114 changes: 63 additions & 51 deletions ...ache/iotdb/pipe/it/dual/tablemodel/manual/enhanced/IoTDBPipeTypeConversionISessionIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,71 +367,83 @@ private List<List<Object>> generateTabletResultSetForTable(
switch (sourceType) {
case INT64:
case TIMESTAMP:
value =
ValueConverter.convert(
sourceType,
targetType,
tablet.getBitMaps()[j].isMarked(i) ? null : ((long[]) values[j])[i]);
insertRecord.add(convert(value, targetType));
value = tablet.getBitMaps()[j].isMarked(i) ? null : ((long[]) values[j])[i];
if (targetType.isCompatible(sourceType)) {
value = targetType.castFromSingleValue(sourceType, value);
} else {
value = ValueConverter.convert(sourceType, targetType, value);
value = convert(value, targetType);
}
insertRecord.add(value);
break;
case INT32:
value =
ValueConverter.convert(
sourceType,
targetType,
tablet.getBitMaps()[j].isMarked(i) ? null : ((int[]) values[j])[i]);
insertRecord.add(convert(value, targetType));
value = tablet.getBitMaps()[j].isMarked(i) ? null : ((int[]) values[j])[i];
if (targetType.isCompatible(sourceType)) {
value = targetType.castFromSingleValue(sourceType, value);
} else {
value = ValueConverter.convert(sourceType, targetType, value);
value = convert(value, targetType);
}
insertRecord.add(value);
break;
case DOUBLE:
value =
ValueConverter.convert(
sourceType,
targetType,
tablet.getBitMaps()[j].isMarked(i) ? null : ((double[]) values[j])[i]);
insertRecord.add(convert(value, targetType));
value = tablet.getBitMaps()[j].isMarked(i) ? null : ((double[]) values[j])[i];
if (targetType.isCompatible(sourceType)) {
value = targetType.castFromSingleValue(sourceType, value);
} else {
value = ValueConverter.convert(sourceType, targetType, value);
value = convert(value, targetType);
}
insertRecord.add(value);
break;
case FLOAT:
value =
ValueConverter.convert(
sourceType,
targetType,
tablet.getBitMaps()[j].isMarked(i) ? null : ((float[]) values[j])[i]);
insertRecord.add(convert(value, targetType));
value = tablet.getBitMaps()[j].isMarked(i) ? null : ((float[]) values[j])[i];
if (targetType.isCompatible(sourceType)) {
value = targetType.castFromSingleValue(sourceType, value);
} else {
value = ValueConverter.convert(sourceType, targetType, value);
value = convert(value, targetType);
}
insertRecord.add(value);
break;
case DATE:
value =
ValueConverter.convert(
sourceType,
targetType,
tablet.getBitMaps()[j].isMarked(i)
? null
: DateUtils.parseDateExpressionToInt(((LocalDate[]) values[j])[i]));
insertRecord.add(convert(value, targetType));
value = tablet.getBitMaps()[j].isMarked(i) ? null : ((LocalDate[]) values[j])[i];
if (targetType == TSDataType.DATE) {
insertRecord.add(value);
break;
}
if (value != null) {
value = DateUtils.parseDateExpressionToInt((LocalDate) value);
}
if (targetType.isCompatible(sourceType)) {
value = targetType.castFromSingleValue(sourceType, value);
} else {
value = ValueConverter.convert(sourceType, targetType, value);
value = convert(value, targetType);
}
insertRecord.add(value);
break;
case TEXT:
case STRING:
value =
ValueConverter.convert(
sourceType,
targetType,
tablet.getBitMaps()[j].isMarked(i) ? null : ((Binary[]) values[j])[i]);
insertRecord.add(convert(value, targetType));
break;
case BLOB:
value =
ValueConverter.convert(
sourceType,
targetType,
tablet.getBitMaps()[j].isMarked(i) ? null : ((Binary[]) values[j])[i]);
insertRecord.add(convert(value, targetType));
value = tablet.getBitMaps()[j].isMarked(i) ? null : ((Binary[]) values[j])[i];
if (targetType.isCompatible(sourceType)) {
value = targetType.castFromSingleValue(sourceType, value);
} else {
value = ValueConverter.convert(sourceType, targetType, value);
value = convert(value, targetType);
}
insertRecord.add(value);
break;
case BOOLEAN:
value =
ValueConverter.convert(
sourceType,
targetType,
tablet.getBitMaps()[j].isMarked(i) ? null : ((boolean[]) values[j])[i]);
insertRecord.add(convert(value, targetType));
value = tablet.getBitMaps()[j].isMarked(i) ? null : ((boolean[]) values[j])[i];
if (targetType.isCompatible(sourceType)) {
value = targetType.castFromSingleValue(sourceType, value);
} else {
value = ValueConverter.convert(sourceType, targetType, value);
value = convert(value, targetType);
}
insertRecord.add(value);
break;
}
}
Expand Down
91 changes: 69 additions & 22 deletions ...ava/org/apache/iotdb/pipe/it/dual/treemodel/manual/IoTDBPipeTypeConversionISessionIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,11 @@ private void validateResultSet(
break;
case TEXT:
case STRING:
assertEquals(field.getStringValue(), rowValues.get(i));
if (rowValues.get(i) instanceof Binary) {
assertEquals(field.getStringValue(), rowValues.get(i).toString());
} else {
assertEquals(field.getStringValue(), rowValues.get(i));
}
break;
case INT32:
assertEquals(field.getIntV(), (int) rowValues.get(i));
Expand Down Expand Up @@ -602,44 +606,87 @@ private List<List<Object>> generateTabletResultSetForTable(
switch (sourceType) {
case INT64:
case TIMESTAMP:
value = ValueConverter.convert(sourceType, targetType, ((long[]) values[j])[i]);
insertRecord.add(convert(value, targetType));
value = tablet.getBitMaps()[j].isMarked(i) ? null : ((long[]) values[j])[i];
if (targetType.isCompatible(sourceType)) {
value = targetType.castFromSingleValue(sourceType, value);
} else {
value = ValueConverter.convert(sourceType, targetType, value);
value = convert(value, targetType);
}
insertRecord.add(value);
break;
case INT32:
value = ValueConverter.convert(sourceType, targetType, ((int[]) values[j])[i]);
insertRecord.add(convert(value, targetType));
value = tablet.getBitMaps()[j].isMarked(i) ? null : ((int[]) values[j])[i];
if (targetType.isCompatible(sourceType)) {
value = targetType.castFromSingleValue(sourceType, value);
} else {
value = ValueConverter.convert(sourceType, targetType, value);
value = convert(value, targetType);
}
insertRecord.add(value);
break;
case DOUBLE:
value = ValueConverter.convert(sourceType, targetType, ((double[]) values[j])[i]);
insertRecord.add(convert(value, targetType));
value = tablet.getBitMaps()[j].isMarked(i) ? null : ((double[]) values[j])[i];
if (targetType.isCompatible(sourceType)) {
value = targetType.castFromSingleValue(sourceType, value);
} else {
value = ValueConverter.convert(sourceType, targetType, value);
value = convert(value, targetType);
}
insertRecord.add(value);
break;
case FLOAT:
value = ValueConverter.convert(sourceType, targetType, ((float[]) values[j])[i]);
insertRecord.add(convert(value, targetType));
value = tablet.getBitMaps()[j].isMarked(i) ? null : ((float[]) values[j])[i];
if (targetType.isCompatible(sourceType)) {
value = targetType.castFromSingleValue(sourceType, value);
} else {
value = ValueConverter.convert(sourceType, targetType, value);
value = convert(value, targetType);
}
insertRecord.add(value);
break;
case DATE:
value =
ValueConverter.convert(
sourceType,
targetType,
DateUtils.parseDateExpressionToInt(((LocalDate[]) values[j])[i]));
insertRecord.add(convert(value, targetType));
value = tablet.getBitMaps()[j].isMarked(i) ? null : ((LocalDate[]) values[j])[i];
if (targetType == TSDataType.DATE) {
insertRecord.add(value);
break;
}
if (value != null) {
value = DateUtils.parseDateExpressionToInt((LocalDate) value);
}
if (targetType.isCompatible(sourceType)) {
value = targetType.castFromSingleValue(sourceType, value);
} else {
value = ValueConverter.convert(sourceType, targetType, value);
value = convert(value, targetType);
}
insertRecord.add(value);
break;
case TEXT:
case STRING:
value = ValueConverter.convert(sourceType, targetType, ((Binary[]) values[j])[i]);
insertRecord.add(convert(value, targetType));
break;
case BLOB:
value = ValueConverter.convert(sourceType, targetType, ((Binary[]) values[j])[i]);
insertRecord.add(convert(value, targetType));
value = tablet.getBitMaps()[j].isMarked(i) ? null : ((Binary[]) values[j])[i];
if (targetType.isCompatible(sourceType)) {
value = targetType.castFromSingleValue(sourceType, value);
} else {
value = ValueConverter.convert(sourceType, targetType, value);
value = convert(value, targetType);
}
insertRecord.add(value);
break;
case BOOLEAN:
value = ValueConverter.convert(sourceType, targetType, ((boolean[]) values[j])[i]);
insertRecord.add(convert(value, targetType));
value = tablet.getBitMaps()[j].isMarked(i) ? null : ((boolean[]) values[j])[i];
if (targetType.isCompatible(sourceType)) {
value = targetType.castFromSingleValue(sourceType, value);
} else {
value = ValueConverter.convert(sourceType, targetType, value);
value = convert(value, targetType);
}
insertRecord.add(value);
break;
}
}
insertRecord.add(tablet.getTimestamp(i));
insertRecords.add(insertRecord);
}

Expand Down
44 changes: 28 additions & 16 deletions ...n-test/src/test/java/org/apache/iotdb/relational/it/session/IoTDBSessionRelationalIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1452,12 +1452,22 @@ private void testOneCastWithTablet(
rec = dataSet.next();
assertEquals(1, rec.getFields().get(0).getLongV());
assertEquals("d1", rec.getFields().get(1).toString());
if (to == TSDataType.BLOB) {
assertEquals(genValue(to, 1), rec.getFields().get(2).getBinaryV());
} else if (to == TSDataType.DATE) {
assertEquals(genValue(to, 1), rec.getFields().get(2).getDateV());
} else {
assertEquals(genValue(to, 1).toString(), rec.getFields().get(2).toString());

switch (to) {
case BLOB:
assertEquals(genValue(to, 1), rec.getFields().get(2).getBinaryV());
break;
case DATE:
assertEquals(genValue(to, 1), rec.getFields().get(2).getDateV());
break;
case FLOAT:
assertEquals(genValue(to, 1), rec.getFields().get(2).getFloatV());
break;
case DOUBLE:
assertEquals(genValue(to, 1), rec.getFields().get(2).getDoubleV());
break;
default:
assertEquals(String.valueOf(genValue(from, 1)), rec.getFields().get(2).toString());
}
assertFalse(dataSet.hasNext());
} else {
Expand Down Expand Up @@ -1621,17 +1631,19 @@ public void insertRelationalTabletWithAutoCastTest()
dataTypes.remove(TSDataType.VECTOR);
dataTypes.remove(TSDataType.UNKNOWN);

for (TSDataType from : dataTypes) {
for (TSDataType to : dataTypes) {
System.out.println("from: " + from + ", to: " + to);
testOneCastWithTablet(from, to, testNum, false);
System.out.println("partial insert");
testOneCastWithTablet(from, to, testNum, true);
try {
for (TSDataType from : dataTypes) {
for (TSDataType to : dataTypes) {
System.out.println("from: " + from + ", to: " + to);
testOneCastWithTablet(from, to, testNum, false);
System.out.println("partial insert");
testOneCastWithTablet(from, to, testNum, true);
}
}
} finally {
try (ISession session = EnvFactory.getEnv().getSessionConnection()) {
session.executeNonQueryStatement("SET CONFIGURATION \"enable_partial_insert\"=\"true\"");
}
}

try (ISession session = EnvFactory.getEnv().getSessionConnection()) {
session.executeNonQueryStatement("SET CONFIGURATION \"enable_partial_insert\"=\"true\"");
}
}

Expand Down
4 changes: 0 additions & 4 deletions integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionSchemaTemplateIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,10 +498,6 @@ public void testHybridAutoExtendSchemaTemplate()
e.getMessage()
.contains(
"data type of root.db.v4.d2.b is not consistent, registered type FLOAT, inserting type DOUBLE"));
Assert.assertTrue(
e.getMessage()
.contains(
"data type of root.db.v4.d2.c is not consistent, registered type TEXT, inserting type INT32"));
}
}
}
4 changes: 3 additions & 1 deletion iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/session/SessionManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import org.apache.iotdb.commons.service.metric.MetricService;
import org.apache.iotdb.commons.service.metric.enums.Metric;
import org.apache.iotdb.commons.service.metric.enums.Tag;
import org.apache.iotdb.commons.utils.AuthUtils;
import org.apache.iotdb.commons.utils.CommonDateTimeUtils;
import org.apache.iotdb.db.audit.DNAuditLogger;
import org.apache.iotdb.db.auth.AuthorityChecker;
Expand Down Expand Up @@ -175,7 +176,8 @@ public BasicOpenSessionResp login(
username);
long currentTime = CommonDateTimeUtils.currentTime();
TSStatus tsStatus =
DataNodeAuthUtils.recordPasswordHistory(userId, password, password, currentTime);
DataNodeAuthUtils.recordPasswordHistory(
userId, password, AuthUtils.encryptPassword(password), currentTime);
if (tsStatus.getCode() != TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
openSessionResp
.sessionId(-1)
Expand Down
3 changes: 3 additions & 0 deletions .../org/apache/iotdb/db/storageengine/dataregion/read/reader/chunk/MemAlignedPageReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,9 @@ public boolean isModified() {
return false;
}

@Override
public void setModified(boolean modified) {}

@Override
public void initTsBlockBuilder(List<TSDataType> dataTypes) {
builder = new TsBlockBuilder(dataTypes);
Expand Down
3 changes: 3 additions & 0 deletions ...in/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/chunk/MemPageReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,9 @@ public boolean isModified() {
return false;
}

@Override
public void setModified(boolean modified) {}

@Override
public void initTsBlockBuilder(List<TSDataType> dataTypes) {
// non-aligned page reader don't need to init TsBlockBuilder at the very beginning
Expand Down
Loading